tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: clang-format

This commit is contained in:
Philipp Oeser 2019-09-09 15:23:00 +02:00
parent 5d9c01c53f
commit 8127bbbe39
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/shaders/node_noise_texture.osl
View File

@ -131,7 +131,7 @@ shader node_noise_texture(int use_mapping = 0,
vector3 p = Vector; vector3 p = Vector;
if (use_mapping) if (use_mapping)
p = transform(mapping, p); p = transform(mapping, p);
p *= Scale; p *= Scale;
float w = W * Scale; float w = W * Scale;

13
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -2755,7 +2755,7 @@ static void gpencil_speed_guide_init(tGPsdata *p, GP_Sculpt_Guide *guide)
angle = p->guide.origin_angle + guide->angle; angle = p->guide.origin_angle + guide->angle;
angle = fmodf(angle + half_angle, guide->angle_snap); angle = fmodf(angle + half_angle, guide->angle_snap);
angle -= half_angle; angle -= half_angle;
gp_rotate_v2_v2v2fl(p->guide.rot_point, p->mvali, p->guide.origin, -angle ); gp_rotate_v2_v2v2fl(p->guide.rot_point, p->mvali, p->guide.origin, -angle);
} }
else { else {
gp_rotate_v2_v2v2fl(p->guide.rot_point, p->guide.unit, p->mvali, guide->angle); gp_rotate_v2_v2v2fl(p->guide.rot_point, p->guide.unit, p->mvali, guide->angle);
@ -2921,8 +2921,7 @@ static void gpencil_draw_apply_event(
if (is_speed_guide && !ELEM(p->paintmode, GP_PAINTMODE_ERASER, GP_PAINTMODE_SET_CP) && if (is_speed_guide && !ELEM(p->paintmode, GP_PAINTMODE_ERASER, GP_PAINTMODE_SET_CP) &&
((guide->use_snapping && (guide->type == GP_GUIDE_GRID)) || ((guide->use_snapping && (guide->type == GP_GUIDE_GRID)) ||
(guide->type == GP_GUIDE_ISO))) (guide->type == GP_GUIDE_ISO))) {
{
p->flags |= GP_PAINTFLAG_REQ_VECTOR; p->flags |= GP_PAINTFLAG_REQ_VECTOR;
} }
@ -2962,10 +2961,10 @@ static void gpencil_draw_apply_event(
gp_rotate_v2_v2v2fl(p->guide.rot_point, p->guide.unit, p->mvali, p->guide.rot_angle); gp_rotate_v2_v2v2fl(p->guide.rot_point, p->guide.unit, p->mvali, p->guide.rot_angle);
} }
else if (ELEM(guide->type, GP_GUIDE_GRID)) { else if (ELEM(guide->type, GP_GUIDE_GRID)) {
gp_rotate_v2_v2v2fl(p->guide.rot_point, gp_rotate_v2_v2v2fl(p->guide.rot_point,
p->guide.unit, p->guide.unit,
p->mvali, p->mvali,
(p->straight == STROKE_VERTICAL) ? M_PI_2 : 0.0f); (p->straight == STROKE_VERTICAL) ? M_PI_2 : 0.0f);
} }
/* create fake events */ /* create fake events */

5
source/blender/editors/space_file/file_draw.c
View File

@ -224,7 +224,7 @@ static void file_draw_preview(uiBlock *block,
float scale; float scale;
int ex, ey; int ex, ey;
bool show_outline = !is_icon && bool show_outline = !is_icon &&
(typeflags & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_BLENDER)); (typeflags & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_BLENDER));
BLI_assert(imb != NULL); BLI_assert(imb != NULL);
@ -315,8 +315,7 @@ static void file_draw_preview(uiBlock *block,
uchar icon_color[4] = {0, 0, 0, 255}; uchar icon_color[4] = {0, 0, 0, 255};
float bgcolor[4]; float bgcolor[4];
UI_GetThemeColor4fv(TH_TEXT, bgcolor); UI_GetThemeColor4fv(TH_TEXT, bgcolor);
if (rgb_to_grayscale(bgcolor) < 0.5f) if (rgb_to_grayscale(bgcolor) < 0.5f) {
{
icon_color[0] = 255; icon_color[0] = 255;
icon_color[1] = 255; icon_color[1] = 255;
icon_color[2] = 255; icon_color[2] = 255;