1 files changed, 84 insertions, 42 deletions

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 5fad95c54e2..81b1375f0f6 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -355,8 +355,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
     sce_copy->eevee.light_cache = NULL;
     sce_copy->eevee.light_cache_info[0] = '\0';
 
-    if (sce->id.properties)
+    if (sce->id.properties) {
       sce_copy->id.properties = IDP_CopyProperty(sce->id.properties);
+    }
 
     MEM_freeN(sce_copy->toolsettings);
     BKE_sound_destroy_scene(sce_copy);
@@ -455,8 +456,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 
 void BKE_scene_groups_relink(Scene *sce)
 {
-  if (sce->rigidbody_world)
+  if (sce->rigidbody_world) {
     BKE_rigidbody_world_groups_relink(sce->rigidbody_world);
+  }
 }
 
 void BKE_scene_make_local(Main *bmain, Scene *sce, const bool lib_local)
@@ -1016,8 +1018,9 @@ void BKE_scene_set_background(Main *bmain, Scene *scene)
   BKE_scene_validate_setscene(bmain, scene);
 
   /* deselect objects (for dataselect) */
-  for (ob = bmain->objects.first; ob; ob = ob->id.next)
+  for (ob = bmain->objects.first; ob; ob = ob->id.next) {
     ob->flag &= ~SELECT;
+  }
 
   /* copy layers and flags from bases to objects */
   for (ViewLayer *view_layer = scene->view_layers.first; view_layer;
@@ -1204,8 +1207,9 @@ Object *BKE_scene_camera_switch_find(Scene *scene)
         camera = m->camera;
         frame = m->frame;
 
-        if (frame == cfra)
+        if (frame == cfra) {
           break;
+        }
       }
 
       if (m->frame < min_frame) {
@@ -1249,14 +1253,17 @@ char *BKE_scene_find_marker_name(Scene *scene, int frame)
 
   /* search through markers for match */
   for (m1 = markers->first, m2 = markers->last; m1 && m2; m1 = m1->next, m2 = m2->prev) {
-    if (m1->frame == frame)
+    if (m1->frame == frame) {
       return m1->name;
+    }
 
-    if (m1 == m2)
+    if (m1 == m2) {
       break;
+    }
 
-    if (m2->frame == frame)
+    if (m2->frame == frame) {
       return m2->name;
+    }
   }
 
   return NULL;
@@ -1295,11 +1302,13 @@ int BKE_scene_frame_snap_by_seconds(Scene *scene, double interval_in_seconds, in
 void BKE_scene_remove_rigidbody_object(struct Main *bmain, Scene *scene, Object *ob)
 {
   /* remove rigid body constraint from world before removing object */
-  if (ob->rigidbody_constraint)
+  if (ob->rigidbody_constraint) {
     BKE_rigidbody_remove_constraint(scene, ob);
+  }
   /* remove rigid body object from world before removing object */
-  if (ob->rigidbody_object)
+  if (ob->rigidbody_object) {
     BKE_rigidbody_remove_object(bmain, scene, ob);
+  }
 }
 
 /* checks for cycle, returns 1 if it's all OK */
@@ -1308,8 +1317,9 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene *sce)
   Scene *sce_iter;
   int a, totscene;
 
-  if (sce->set == NULL)
+  if (sce->set == NULL) {
     return true;
+  }
   totscene = BLI_listbase_count(&bmain->scenes);
 
   for (a = 0, sce_iter = sce; sce_iter->set; sce_iter = sce_iter->set, a++) {
@@ -1590,8 +1600,9 @@ SceneRenderView *BKE_scene_add_render_view(Scene *sce, const char *name)
 {
   SceneRenderView *srv;
 
-  if (!name)
+  if (!name) {
     name = DATA_("RenderView");
+  }
 
   srv = MEM_callocN(sizeof(SceneRenderView), "new render view");
   BLI_strncpy(srv->name, name, sizeof(srv->name));
@@ -1631,10 +1642,12 @@ bool BKE_scene_remove_render_view(Scene *scene, SceneRenderView *srv)
 int get_render_subsurf_level(const RenderData *r, int lvl, bool for_render)
 {
   if (r->mode & R_SIMPLIFY) {
-    if (for_render)
+    if (for_render) {
       return min_ii(r->simplify_subsurf_render, lvl);
-    else
+    }
+    else {
       return min_ii(r->simplify_subsurf, lvl);
+    }
   }
   else {
     return lvl;
@@ -1644,10 +1657,12 @@ int get_render_subsurf_level(const RenderData *r, int lvl, bool for_render)
 int get_render_child_particle_number(const RenderData *r, int num, bool for_render)
 {
   if (r->mode & R_SIMPLIFY) {
-    if (for_render)
+    if (for_render) {
       return (int)(r->simplify_particles_render * num);
-    else
+    }
+    else {
       return (int)(r->simplify_particles * num);
+    }
   }
   else {
     return num;
@@ -1793,14 +1808,17 @@ int BKE_render_num_threads(const RenderData *rd)
   /* override set from command line? */
   threads = BLI_system_num_threads_override_get();
 
-  if (threads > 0)
+  if (threads > 0) {
     return threads;
+  }
 
   /* fixed number of threads specified in scene? */
-  if (rd->mode & R_FIXED_THREADS)
+  if (rd->mode & R_FIXED_THREADS) {
     threads = rd->threads;
-  else
+  }
+  else {
     threads = BLI_system_thread_count();
+  }
 
   return max_ii(threads, 1);
 }
@@ -1851,8 +1869,9 @@ int BKE_scene_multiview_num_views_get(const RenderData *rd)
   SceneRenderView *srv;
   int totviews = 0;
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return 1;
+  }
 
   if (rd->views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
     srv = BLI_findstring(&rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name));
@@ -1879,8 +1898,9 @@ bool BKE_scene_multiview_is_stereo3d(const RenderData *rd)
 {
   SceneRenderView *srv[2];
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return false;
+  }
 
   srv[0] = (SceneRenderView *)BLI_findstring(
       &rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name));
@@ -1894,17 +1914,21 @@ bool BKE_scene_multiview_is_stereo3d(const RenderData *rd)
 /* return whether to render this SceneRenderView */
 bool BKE_scene_multiview_is_render_view_active(const RenderData *rd, const SceneRenderView *srv)
 {
-  if (srv == NULL)
+  if (srv == NULL) {
     return false;
+  }
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return false;
+  }
 
-  if ((srv->viewflag & SCE_VIEW_DISABLE))
+  if ((srv->viewflag & SCE_VIEW_DISABLE)) {
     return false;
+  }
 
-  if (rd->views_format == SCE_VIEWS_FORMAT_MULTIVIEW)
+  if (rd->views_format == SCE_VIEWS_FORMAT_MULTIVIEW) {
     return true;
+  }
 
   /* SCE_VIEWS_SETUP_BASIC */
   if (STREQ(srv->name, STEREO_LEFT_NAME) || STREQ(srv->name, STEREO_RIGHT_NAME)) {
@@ -1919,11 +1943,13 @@ bool BKE_scene_multiview_is_render_view_first(const RenderData *rd, const char *
 {
   SceneRenderView *srv;
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return true;
+  }
 
-  if ((!viewname) || (!viewname[0]))
+  if ((!viewname) || (!viewname[0])) {
     return true;
+  }
 
   for (srv = rd->views.first; srv; srv = srv->next) {
     if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
@@ -1939,11 +1965,13 @@ bool BKE_scene_multiview_is_render_view_last(const RenderData *rd, const char *v
 {
   SceneRenderView *srv;
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return true;
+  }
 
-  if ((!viewname) || (!viewname[0]))
+  if ((!viewname) || (!viewname[0])) {
     return true;
+  }
 
   for (srv = rd->views.last; srv; srv = srv->prev) {
     if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
@@ -1959,13 +1987,15 @@ SceneRenderView *BKE_scene_multiview_render_view_findindex(const RenderData *rd,
   SceneRenderView *srv;
   size_t nr;
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return NULL;
+  }
 
   for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
     if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
-      if (nr++ == view_id)
+      if (nr++ == view_id) {
         return srv;
+      }
     }
   }
   return srv;
@@ -1975,10 +2005,12 @@ const char *BKE_scene_multiview_render_view_name_get(const RenderData *rd, const
 {
   SceneRenderView *srv = BKE_scene_multiview_render_view_findindex(rd, view_id);
 
-  if (srv)
+  if (srv) {
     return srv->name;
-  else
+  }
+  else {
     return "";
+  }
 }
 
 int BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname)
@@ -1986,11 +2018,13 @@ int BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname)
   SceneRenderView *srv;
   size_t nr;
 
-  if ((!rd) || ((rd->scemode & R_MULTIVIEW) == 0))
+  if ((!rd) || ((rd->scemode & R_MULTIVIEW) == 0)) {
     return 0;
+  }
 
-  if ((!viewname) || (!viewname[0]))
+  if ((!viewname) || (!viewname[0])) {
     return 0;
+  }
 
   for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
     if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
@@ -2027,10 +2061,12 @@ void BKE_scene_multiview_view_filepath_get(const RenderData *rd,
   char suffix[FILE_MAX];
 
   srv = BLI_findstring(&rd->views, viewname, offsetof(SceneRenderView, name));
-  if (srv)
+  if (srv) {
     BLI_strncpy(suffix, srv->suffix, sizeof(suffix));
-  else
+  }
+  else {
     BLI_strncpy(suffix, viewname, sizeof(suffix));
+  }
 
   BLI_strncpy(r_filepath, filepath, FILE_MAX);
   BLI_path_suffix(r_filepath, FILE_MAX, suffix, "");
@@ -2040,14 +2076,17 @@ const char *BKE_scene_multiview_view_suffix_get(const RenderData *rd, const char
 {
   SceneRenderView *srv;
 
-  if ((viewname == NULL) || (viewname[0] == '\0'))
+  if ((viewname == NULL) || (viewname[0] == '\0')) {
     return viewname;
+  }
 
   srv = BLI_findstring(&rd->views, viewname, offsetof(SceneRenderView, name));
-  if (srv)
+  if (srv) {
     return srv->suffix;
-  else
+  }
+  else {
     return viewname;
+  }
 }
 
 const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, const int view_id)
@@ -2075,8 +2114,9 @@ void BKE_scene_multiview_view_prefix_get(Scene *scene,
 
   /* begin of extension */
   index_act = BLI_str_rpartition(name, delims, rext, &suf_act);
-  if (*rext == NULL)
+  if (*rext == NULL) {
     return;
+  }
   BLI_assert(index_act > 0);
   UNUSED_VARS_NDEBUG(index_act);
 
@@ -2113,11 +2153,13 @@ void BKE_scene_multiview_videos_dimensions_get(const RenderData *rd,
 
 int BKE_scene_multiview_num_videos_get(const RenderData *rd)
 {
-  if (BKE_imtype_is_movie(rd->im_format.imtype) == false)
+  if (BKE_imtype_is_movie(rd->im_format.imtype) == false) {
     return 0;
+  }
 
-  if ((rd->scemode & R_MULTIVIEW) == 0)
+  if ((rd->scemode & R_MULTIVIEW) == 0) {
     return 1;
+  }
 
   if (rd->im_format.views_format == R_IMF_VIEWS_STEREO_3D) {
     return 1;