Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-26 02:15:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-26 02:15:46 +0300
commitadfdae3fc2f48de603de971f62a34e5d3a4b7d6b (patch)
tree8c53aa3de432b0a986d1869a3f6494e76caefa39 /source
parenta750dea74e5278d24a800468bcf5f433d4a46bcf (diff)
Cleanup: style
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_dynamicpaint.h2
-rw-r--r--source/blender/blenkernel/BKE_paint.h2
-rw-r--r--source/blender/blenloader/intern/readfile.c3
-rw-r--r--source/blender/editors/gpencil/gpencil_primitive.c2
-rw-r--r--source/blender/editors/gpencil/gpencil_utils.c6
5 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 61b13536370..6b470a89703 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -22,9 +22,9 @@
*/
struct Depsgraph;
-struct DynamicPaintRuntime;
struct DynamicPaintCanvasSettings;
struct DynamicPaintModifierData;
+struct DynamicPaintRuntime;
struct Main;
struct Scene;
struct ViewLayer;
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index cc445413f61..abb1b1d9cc5 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -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;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 190b07991e5..f1aecc92bfd 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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) {
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index ddfbbded64b..bde6bd30b76 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -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;
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index f517cc59b7e..d8772c5f1e2 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -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);