svn merge ^/trunk/blender -r43819:43830

2012-02-02 00:04:47 +00:00
parent 4aa82806ef ca927b5771
commit 8926cbd0a7
19 changed files with 1081 additions and 970 deletions
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -606,6 +606,7 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):

        col = split.column()
        col.prop(cmat, "sample_as_light")
+        col.prop(mat, "pass_index")


 class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):