bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Tweaks to Render Layers panel

Browse Source 
'Mask layers' should be visible always, they still work to mask out objects on 
layers when zmask isn't on (zmask is slightly different.. a bit confusing)

Icon tweaks too
This commit is contained in:
Matt Ebb 2010-04-23 06:33:30 +00:00
parent ce9d5c43e2
commit 320408ff12
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
release/scripts/ui/properties_render.py
View File

@ -97,12 +97,16 @@ class RENDER_PT_layers(RenderButtonsPanel):
col = split.column()
col.prop(scene, "layers", text="Scene")
col.label(text="")
col.prop(rl, "light_override", text="Light")
col.prop(rl, "material_override", text="Material")
if wide_ui:
col = split.column()
col.prop(rl, "visible_layers", text="Layer")
col.label(text="Mask Layers:")
col.prop(rl, "zmask_layers", text="")
layout.prop(rl, "light_override", text="Light")
layout.prop(rl, "material_override", text="Material")
layout.separator()
layout.label(text="Include:")
@ -126,11 +130,6 @@ class RENDER_PT_layers(RenderButtonsPanel):
col.prop(rl, "edge")
col.prop(rl, "strand")
if rl.zmask:
split = layout.split()
split.label(text="Zmask Layers:")
split.column().prop(rl, "zmask_layers", text="")
layout.separator()
split = layout.split()
@ -152,28 +151,28 @@ class RENDER_PT_layers(RenderButtonsPanel):
col.prop(rl, "pass_diffuse")
row = col.row()
row.prop(rl, "pass_specular")
row.prop(rl, "pass_specular_exclude", text="", icon='X')
row.prop(rl, "pass_specular_exclude", text="")
row = col.row()
row.prop(rl, "pass_shadow")
row.prop(rl, "pass_shadow_exclude", text="", icon='X')
row.prop(rl, "pass_shadow_exclude", text="")
row = col.row()
row.prop(rl, "pass_emit")
row.prop(rl, "pass_emit_exclude", text="", icon='X')
row.prop(rl, "pass_emit_exclude", text="")
row = col.row()
row.prop(rl, "pass_ao")
row.prop(rl, "pass_ao_exclude", text="", icon='X')
row.prop(rl, "pass_ao_exclude", text="")
row = col.row()
row.prop(rl, "pass_environment")
row.prop(rl, "pass_environment_exclude", text="", icon='X')
row.prop(rl, "pass_environment_exclude", text="")
row = col.row()
row.prop(rl, "pass_indirect")
row.prop(rl, "pass_indirect_exclude", text="", icon='X')
row.prop(rl, "pass_indirect_exclude", text="")
row = col.row()
row.prop(rl, "pass_reflection")
row.prop(rl, "pass_reflection_exclude", text="", icon='X')
row.prop(rl, "pass_reflection_exclude", text="")
row = col.row()
row.prop(rl, "pass_refraction")
row.prop(rl, "pass_refraction_exclude", text="", icon='X')
row.prop(rl, "pass_refraction_exclude", text="")
class RENDER_PT_shading(RenderButtonsPanel):

2
source/blender/editors/space_outliner/outliner.c
View File

@ -4272,7 +4272,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case TSE_R_LAYER_BASE:
UI_icon_draw(x, y, ICON_RENDERLAYERS); break;
case TSE_R_LAYER:
UI_icon_draw(x, y, ICON_RENDER_RESULT); break;
UI_icon_draw(x, y, ICON_RENDERLAYERS); break;
case TSE_LINKED_LAMP:
UI_icon_draw(x, y, ICON_LAMP_DATA); break;
case TSE_LINKED_MAT:

9
source/blender/makesrna/intern/rna_scene.c
View File

@ -1399,48 +1399,56 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
prop= RNA_def_property(srna, "pass_specular_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SPEC);
RNA_def_property_ui_text(prop, "Specular Exclude", "Exclude specular pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_shadow_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SHADOW);
RNA_def_property_ui_text(prop, "Shadow Exclude", "Exclude shadow pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_ao_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_AO);
RNA_def_property_ui_text(prop, "AO Exclude", "Exclude AO pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_reflection_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFLECT);
RNA_def_property_ui_text(prop, "Reflection Exclude", "Exclude raytraced reflection pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_refraction_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFRACT);
RNA_def_property_ui_text(prop, "Refraction Exclude", "Exclude raytraced refraction pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_emit_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_EMIT);
RNA_def_property_ui_text(prop, "Emit Exclude", "Exclude emission pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_environment_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_ENVIRONMENT);
RNA_def_property_ui_text(prop, "Environment Exclude", "Exclude environment pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop= RNA_def_property(srna, "pass_indirect_exclude", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_INDIRECT);
RNA_def_property_ui_text(prop, "Indirect Exclude", "Exclude indirect pass from combined");
RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
}
@ -1739,6 +1747,7 @@ static void rna_def_scene_render_layer(BlenderRNA *brna)
srna= RNA_def_struct(brna, "SceneRenderLayer", NULL);
RNA_def_struct_ui_text(srna, "Scene Render Layer", "Render layer");
RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS);
rna_def_render_layer_common(srna, 1);
}