[Bf-blender-cvs] [bd18ffe1f8a] blender-v2.83-release: Fix T76388: Freestyle not respecting Show Emitter settings

[Brecht Van Lommel]

Commit: bd18ffe1f8afb187386354561e10ee4ff0df3303
Author: Brecht Van Lommel
Date:   Thu May 14 01:30:09 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBbd18ffe1f8afb187386354561e10ee4ff0df3303

Fix T76388: Freestyle not respecting Show Emitter settings

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

M	source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

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

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index f49a664096a..7bceb036846 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -85,6 +85,7 @@ NodeGroup *BlenderFileLoader::Load()
 #endif
 
   int id = 0;
+  const eEvaluationMode eval_mode = DEG_get_mode(_depsgraph);
 
   DEG_OBJECT_ITER_BEGIN (_depsgraph,
                          ob,
@@ -99,6 +100,10 @@ NodeGroup *BlenderFileLoader::Load()
       continue;
     }
 
+    if (!(BKE_object_visibility(ob, eval_mode) & OB_VISIBLE_SELF)) {
+      continue;
+    }
+
     Mesh *mesh = BKE_object_to_mesh(NULL, ob, false);
 
     if (mesh) {