archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

RNA fix/addition: Made scene render freestyle_settings.linesets consistent

Browse Source 
with recent changes in the trunk revision 31570 for adding scene render
layers' active and active_index properties.
This commit is contained in:
Tamito Kajiyama
2010-08-28 15:10:37 +00:00
parent 12f9a5de5b
commit bc7fcc57f6
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,14 +198,14 @@ class RENDER_PT_freestyle(RenderButtonsPanel, bpy.types.Panel):
col.prop(freestyle, "sphere_radius")
col.prop(freestyle, "kr_derivative_epsilon")
lineset = freestyle.active_lineset
lineset = freestyle.linesets.active
col.label(text="Line Sets:")
row = col.row()
rows = 2
if lineset:
rows = 5
row.template_list(freestyle, "linesets", freestyle, "active_lineset_index", rows=rows)
row.template_list(freestyle, "linesets", freestyle.linesets, "active_index", rows=rows)
sub = row.column()
subsub = sub.column(align=True)
@@ -284,7 +284,7 @@ class RENDER_PT_freestyle_linestyle(RenderButtonsPanel, bpy.types.Panel):
rl = rd.layers.active
if rl and rl.use_freestyle:
freestyle = rl.freestyle_settings
return freestyle.mode == "EDITOR" and freestyle.active_lineset
return freestyle.mode == "EDITOR" and freestyle.linesets.active
return False
def draw_modifier_box_header(self, box, modifier):
@@ -377,7 +377,7 @@ class RENDER_PT_freestyle_linestyle(RenderButtonsPanel, bpy.types.Panel):
rd = context.scene.render
rl = rd.layers.active
lineset = rl.freestyle_settings.active_lineset
lineset = rl.freestyle_settings.linesets.active
linestyle = lineset.linestyle
split = layout.split()