[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45535] trunk/blender/intern/cycles/ blender/blender_mesh.cpp: Fix #30896: cycles mask layer not working for objects without material assigned.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Apr 11 10:57:54 CEST 2012


Revision: 45535
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45535
Author:   blendix
Date:     2012-04-11 08:57:54 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Fix #30896: cycles mask layer not working for objects without material assigned.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_mesh.cpp

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-04-11 08:37:48 UTC (rev 45534)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-04-11 08:57:54 UTC (rev 45535)
@@ -243,8 +243,12 @@
 			find_shader(slot->material(), used_shaders, scene->default_surface);
 	}
 
-	if(used_shaders.size() == 0)
-		used_shaders.push_back(scene->default_surface);
+	if(used_shaders.size() == 0) {
+		if(holdout)
+			used_shaders.push_back(scene->default_holdout);
+		else
+			used_shaders.push_back(scene->default_surface);
+	}
 	
 	/* test if we need to sync */
 	Mesh *mesh;




More information about the Bf-blender-cvs mailing list