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:
authorBrecht Van Lommel <brecht@blender.org>2020-05-14 02:30:09 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-14 03:14:18 +0300
commitbd18ffe1f8afb187386354561e10ee4ff0df3303 (patch)
tree7a38b7770876d766762504db1fd49bbf826ae5ae /source/blender/freestyle
parent71298a1da9718871b3ac063f814d10e6df98d406 (diff)
Fix T76388: Freestyle not respecting Show Emitter settings
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp5
1 files changed, 5 insertions, 0 deletions
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) {