diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 04:04:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 04:04:47 +0400 |
commit | 8926cbd0a78284c24622dafbcf084c2d4b2a1cf8 (patch) | |
tree | 03332b4b83a793648d27b6d3014b71522f0f2ac1 /intern/cycles | |
parent | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (diff) | |
parent | ca927b5771aba924b6f13242b4483e9f861d3153 (diff) |
svn merge ^/trunk/blender -r43819:43830
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 6353bf37a15..c82ab9ce624 100644 --- 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): |