[Bf-blender-cvs] [16804297e64] master: Cleanup: Split set_preview_visibilty.

[Jeroen Bakker]

Commit: 16804297e64990b21ae14b7cf244f8bed39f6a14
Author: Jeroen Bakker
Date:   Wed Jul 21 09:50:33 2021 +0200
Branches: master
https://developer.blender.org/rB16804297e64990b21ae14b7cf244f8bed39f6a14

Cleanup: Split set_preview_visibilty.

===================================================================

M	source/blender/editors/render/render_preview.c

===================================================================

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index d64cb9beb24..702c8d052c5 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -265,10 +265,7 @@ static const char *preview_collection_name(const ePreviewType pr_type)
   }
 }
 
-static void set_preview_visibility(Scene *scene,
-                                   ViewLayer *view_layer,
-                                   const ePreviewType pr_type,
-                                   const ePreviewRenderMethod pr_method)
+static void switch_preview_collection_visibilty(ViewLayer *view_layer, const ePreviewType pr_type)
 {
   /* Set appropriate layer as visible. */
   LayerCollection *lc = view_layer->layer_collections.first;
@@ -282,7 +279,11 @@ static void set_preview_visibility(Scene *scene,
       lc->collection->flag |= COLLECTION_RESTRICT_RENDER;
     }
   }
+}
 
+static void switch_preview_floor_visibility(ViewLayer *view_layer,
+                                            const ePreviewRenderMethod pr_method)
+{
   /* Hide floor for icon renders. */
   LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
     if (STREQ(base->object->id.name + 2, "Floor")) {
@@ -294,7 +295,15 @@ static void set_preview_visibility(Scene *scene,
       }
     }
   }
+}
 
+static void set_preview_visibility(Scene *scene,
+                                   ViewLayer *view_layer,
+                                   const ePreviewType pr_type,
+                                   const ePreviewRenderMethod pr_method)
+{
+  switch_preview_collection_visibilty(view_layer, pr_type);
+  switch_preview_floor_visibility(view_layer, pr_method);
   BKE_layer_collection_sync(scene, view_layer);
 }