Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Mar 2019 23:15:46 +0000 (10:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Mar 2019 23:15:46 +0000 (10:15 +1100)
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/gpencil/gpencil_primitive.c
source/blender/editors/gpencil/gpencil_utils.c

index 61b135363706a781a4d6c5d1d9c84ee1614d7129..6b470a89703792c0ec08c4410b0e60233e382ac2 100644 (file)
@@ -22,9 +22,9 @@
  */
 
 struct Depsgraph;
-struct DynamicPaintRuntime;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
+struct DynamicPaintRuntime;
 struct Main;
 struct Scene;
 struct ViewLayer;
index cc445413f611f4679118ec5edf116af7213f70a7..abb1b1d9cc5d64ec0d471a937a64ec18f2c4e57b 100644 (file)
@@ -50,13 +50,13 @@ struct Scene;
 struct Sculpt;
 struct StrokeCache;
 struct SubdivCCG;
+struct SubdivCCG;
 struct Tex;
 struct ToolSettings;
 struct UnifiedPaintSettings;
 struct ViewLayer;
 struct bContext;
 struct bToolRef;
-struct SubdivCCG;
 
 enum eOverlayFlags;
 
index 190b07991e5d32c5a698db9a3c921769bb3e1f95..f1aecc92bfd37fdcafe9a8112ca26a1af485f6a4 100644 (file)
@@ -2619,8 +2619,7 @@ static void lib_link_brush(FileData *fd, Main *main)
                        /* link default grease pencil palette */
                        if (brush->gpencil_settings != NULL)
                        {
-                               if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED)
-                               {
+                               if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) {
                                        brush->gpencil_settings->material = newlibadr_us(fd, brush->id.lib, brush->gpencil_settings->material);
 
                                        if (!brush->gpencil_settings->material) {
index ddfbbded64bdef202a74db1666448a8e367ac381..bde6bd30b7654f65a7afb9c1c370617916f8727b 100644 (file)
@@ -140,7 +140,7 @@ static void gp_init_colors(tGPDprimitive *p)
        MaterialGPencilStyle *gp_style = NULL;
 
        /* use brush material */
-       p->mat = BKE_gpencil_current_input_brush_material(p->bmain,p->ob, brush);
+       p->mat = BKE_gpencil_current_input_brush_material(p->bmain, p->ob, brush);
 
        /* assign color information to temp data */
        gp_style = p->mat->gp_style;
index f517cc59b7eab550bee635f7bc280200aff8849c..d8772c5f1e2d901b13747739f789697505d3f127 100644 (file)
@@ -1729,9 +1729,9 @@ static void gp_brush_cursor_draw(bContext *C, int x, int y, void *customdata)
                         * The decision was to use a fix size, instead of brush->thickness value.
                         */
                        if ((gp_style) && (GPENCIL_PAINT_MODE(gpd)) &&
-                               ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) &&
-                               ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
-                               (brush->gpencil_tool == GPAINT_TOOL_DRAW))
+                           ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) &&
+                           ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
+                           (brush->gpencil_tool == GPAINT_TOOL_DRAW))
                        {
                                radius = 2.0f;
                                copy_v3_v3(color, gp_style->stroke_rgba);