[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44699] trunk/blender/intern/cycles/ blender: Cycles: mask layers were still confusing, now they work more like in the original

[Brecht Van Lommel]

Revision: 44699
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44699
Author:   blendix
Date:     2012-03-07 12:27:38 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
Cycles: mask layers were still confusing, now they work more like in the original
commit again and less like blender internal, see documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/blender/blender_sync.cpp

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-03-07 12:27:18 UTC (rev 44698)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-03-07 12:27:38 UTC (rev 44699)
@@ -179,7 +179,6 @@
         col.prop(scene, "layers", text="Scene")
         col.label(text="Material:")
         col.prop(rl, "material_override", text="")
-        col.prop(rl, "use_zmask");
 
         col = split.column()
         col.prop(rl, "layers", text="Layer")

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-03-07 12:27:18 UTC (rev 44698)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-03-07 12:27:38 UTC (rev 44699)
@@ -204,7 +204,7 @@
 				render_layer.name = b_rlay->name();
 				render_layer.scene_layer = get_layer(b_scene.layers());
 				render_layer.layer = get_layer(b_rlay->layers());
-				render_layer.holdout_layer = (b_rlay->use_zmask())? ~get_layer(b_rlay->layers_zmask()): 0;
+				render_layer.holdout_layer = get_layer(b_rlay->layers_zmask());
 				render_layer.layer |= render_layer.holdout_layer;
 				render_layer.material_override = b_rlay->material_override();
 			}