diff options
-rw-r--r-- | intern/cycles/kernel/shaders/node_noise_texture.osl | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 13 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl index 242a7e33f60..e3da2d16371 100644 --- a/intern/cycles/kernel/shaders/node_noise_texture.osl +++ b/intern/cycles/kernel/shaders/node_noise_texture.osl @@ -131,7 +131,7 @@ shader node_noise_texture(int use_mapping = 0, vector3 p = Vector; if (use_mapping) p = transform(mapping, p); - + p *= Scale; float w = W * Scale; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index a585d3b71fc..d5c701488c9 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -2755,7 +2755,7 @@ static void gpencil_speed_guide_init(tGPsdata *p, GP_Sculpt_Guide *guide) angle = p->guide.origin_angle + guide->angle; angle = fmodf(angle + half_angle, guide->angle_snap); 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 { 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) && ((guide->use_snapping && (guide->type == GP_GUIDE_GRID)) || - (guide->type == GP_GUIDE_ISO))) - { + (guide->type == GP_GUIDE_ISO))) { 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); } else if (ELEM(guide->type, GP_GUIDE_GRID)) { - gp_rotate_v2_v2v2fl(p->guide.rot_point, - p->guide.unit, - p->mvali, - (p->straight == STROKE_VERTICAL) ? M_PI_2 : 0.0f); + gp_rotate_v2_v2v2fl(p->guide.rot_point, + p->guide.unit, + p->mvali, + (p->straight == STROKE_VERTICAL) ? M_PI_2 : 0.0f); } /* create fake events */ diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index e11ca06494d..ca26a56a26e 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -224,7 +224,7 @@ static void file_draw_preview(uiBlock *block, float scale; int ex, ey; 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); @@ -315,8 +315,7 @@ static void file_draw_preview(uiBlock *block, uchar icon_color[4] = {0, 0, 0, 255}; float bgcolor[4]; 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[1] = 255; icon_color[2] = 255; |