[Bf-blender-cvs] [391e35d5a0e] master: Fix T60669: freestyle rendering holdout / indirect only collections.

[Brecht Van Lommel]

Commit: 391e35d5a0e5185f714278d2717381a47ae54d4e
Author: Brecht Van Lommel
Date:   Thu Jan 24 07:14:28 2019 +0100
Branches: master
https://developer.blender.org/rB391e35d5a0e5185f714278d2717381a47ae54d4e

Fix T60669: freestyle rendering holdout / indirect only collections.

To match Cycles we can hide freestyle lines for these.

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

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 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,