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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-31 16:21:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-31 16:22:52 +0300
commitaba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch)
tree2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/editors/sculpt_paint
parent72a563cdee8fef198a200ff65b57ddb847c01795 (diff)
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r--source/blender/editors/sculpt_paint/paint_image.c6
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_proj.c3
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c3
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_undo.c3
4 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index f7a589350f9..2bbb99b2b67 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -653,16 +653,18 @@ static void paint_stroke_done(const bContext *C, struct PaintStroke *stroke)
/* duplicate warning, see texpaint_init */
#if 0
- if (pop->s.warnmultifile)
+ if (pop->s.warnmultifile) {
BKE_reportf(op->reports,
RPT_WARNING,
"Image requires 4 color channels to paint: %s",
pop->s.warnmultifile);
- if (pop->s.warnpackedfile)
+ }
+ if (pop->s.warnpackedfile) {
BKE_reportf(op->reports,
RPT_WARNING,
"Packed MultiLayer files cannot be painted: %s",
pop->s.warnpackedfile);
+ }
#endif
MEM_freeN(pop);
}
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 90ef64b01b7..bae79d5ea60 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -2256,8 +2256,9 @@ static bool project_bucket_isect_circle(const float cent[2],
* this is even less work then an intersection test.
*/
#if 0
- if (BLI_rctf_isect_pt_v(bucket_bounds, cent))
+ if (BLI_rctf_isect_pt_v(bucket_bounds, cent)) {
return 1;
+ }
#endif
if ((bucket_bounds->xmin <= cent[0] && bucket_bounds->xmax >= cent[0]) ||
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 23656737153..2dc1e53af89 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -4225,8 +4225,9 @@ void sculpt_cache_calc_brushdata_symm(StrokeCache *cache,
printf("feather: %f frac: %f reduce: %f\n", feather, frac, reduce);
- if (frac < 1)
+ if (frac < 1) {
mul_v3_fl(cache->grab_delta_symmetry, reduce);
+ }
}
#endif
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index c66c1d91a77..965f31cbb6b 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -654,8 +654,9 @@ static bool sculpt_undo_cleanup(bContext *C, ListBase *lb)
unode = lb->first;
if (unode && !STREQ(unode->idname, ob->id.name)) {
- if (unode->bm_entry)
+ if (unode->bm_entry) {
BM_log_cleanup_entry(unode->bm_entry);
+ }
return true;
}