Cleanup: style, use braces for editors

1 files changed, 24 insertions, 12 deletions

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index f3138c5afec..6e2f0dba969 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -196,14 +196,17 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
             ok = false;
           }
           else {
-            if (ibuf->rect == NULL && ibuf->rect_float == NULL)
+            if (ibuf->rect == NULL && ibuf->rect_float == NULL) {
               ok = false;
+            }
 
-            if (ibuf->rect_float && !(ibuf->channels == 0 || ibuf->channels == 4))
+            if (ibuf->rect_float && !(ibuf->channels == 0 || ibuf->channels == 4)) {
               ok = false;
+            }
 
-            if (!ok)
+            if (!ok) {
               BKE_report(op->reports, RPT_ERROR, "Baking to unsupported image type");
+            }
           }
 
           BKE_image_release_ibuf(ima, ibuf, NULL);
@@ -211,8 +214,9 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
       }
     }
 
-    if (!ok)
+    if (!ok) {
       break;
+    }
   }
   CTX_DATA_END;
 
@@ -289,12 +293,15 @@ static void clear_single_image(Image *image, ClearFlag flag)
   if ((image->id.tag & LIB_TAG_DOIT) == 0) {
     ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, NULL);
 
-    if (flag == CLEAR_TANGENT_NORMAL)
+    if (flag == CLEAR_TANGENT_NORMAL) {
       IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? nor_alpha : nor_solid);
-    else if (flag == CLEAR_DISPLACEMENT)
+    }
+    else if (flag == CLEAR_DISPLACEMENT) {
       IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? disp_alpha : disp_solid);
-    else
+    }
+    else {
       IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? vec_alpha : vec_solid);
+    }
 
     image->id.tag |= LIB_TAG_DOIT;
 
@@ -332,8 +339,9 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
   Scene *scene = CTX_data_scene(C);
   int objects_baked = 0;
 
-  if (!multiresbake_check(C, op))
+  if (!multiresbake_check(C, op)) {
     return OPERATOR_CANCELLED;
+  }
 
   if (scene->r.bake_flag & R_BAKE_CLEAR) { /* clear images */
     CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) {
@@ -396,8 +404,9 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
   }
   CTX_DATA_END;
 
-  if (!objects_baked)
+  if (!objects_baked) {
     BKE_report(op->reports, RPT_ERROR, "No objects found to bake from");
+  }
 
   return OPERATOR_FINISHED;
 }
@@ -541,8 +550,9 @@ static int multiresbake_image_exec(bContext *C, wmOperator *op)
   MultiresBakeJob *bkr;
   wmJob *wm_job;
 
-  if (!multiresbake_check(C, op))
+  if (!multiresbake_check(C, op)) {
     return OPERATOR_CANCELLED;
+  }
 
   bkr = MEM_callocN(sizeof(MultiresBakeJob), "MultiresBakeJob data");
   init_multiresbake_job(C, bkr);
@@ -580,8 +590,9 @@ static int multiresbake_image_exec(bContext *C, wmOperator *op)
 static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
 {
   /* no running blender, remove handler and pass through */
-  if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE_TEXTURE))
+  if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE_TEXTURE)) {
     return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
+  }
 
   /* running render */
   switch (event->type) {
@@ -593,8 +604,9 @@ static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const
 
 static bool is_multires_bake(Scene *scene)
 {
-  if (ELEM(scene->r.bake_mode, RE_BAKE_NORMALS, RE_BAKE_DISPLACEMENT, RE_BAKE_AO))
+  if (ELEM(scene->r.bake_mode, RE_BAKE_NORMALS, RE_BAKE_DISPLACEMENT, RE_BAKE_AO)) {
     return scene->r.bake_flag & R_BAKE_MULTIRES;
+  }
 
   return 0;
 }