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 <brechtvanlommel@gmail.com>2019-01-24 09:14:28 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-24 18:46:11 +0300
commit391e35d5a0e5185f714278d2717381a47ae54d4e (patch)
tree12bcc9b344a8825a2ef8539bee74f535c73945d6 /source/blender/freestyle
parent95db2e87498131477a2fbfd9d6bb4fdac2af7961 (diff)
Fix T60669: freestyle rendering holdout / indirect only collections.
To match Cycles we can hide freestyle lines for these.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index a31fb14f849..8a4fa91d650 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -105,6 +105,10 @@ NodeGroup *BlenderFileLoader::Load()
break;
}
+ if (ob->base_flag & (BASE_HOLDOUT | BASE_INDIRECT_ONLY)) {
+ continue;
+ }
+
bool apply_modifiers = false;
bool calc_undeformed = false;
Mesh *mesh = BKE_mesh_new_from_object(depsgraph,