Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-10-11 03:34:27 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-10-11 03:34:27 +0400
commitcc77207ca464d8e790de0524f9ad03a029deeed5 (patch)
tree47fbf12b52987851d77aed956b526f03a91e1a40 /release/scripts
parent84f5a9a71834307e81f9386d911385e658d6d83d (diff)
Fix for missing toggle switches to enable/disable linesets. Also gave
uniform property name "use" to all toggle switches in Freestyle-related options, according to recent RNA renaming.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/freestyle/style_modules/parameter_editor.py6
-rw-r--r--release/scripts/ui/properties_render.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index fe53c2e5152..ea01228b81b 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -479,7 +479,7 @@ def process(layer_name, lineset_name):
ConstantThicknessShader(linestyle.thickness),
ConstantColorShader(color.r, color.g, color.b, linestyle.alpha)]
for m in linestyle.color_modifiers:
- if not m.enabled:
+ if not m.use:
continue
if m.type == "ALONG_STROKE":
shaders_list.append(ColorAlongStrokeShader(
@@ -493,7 +493,7 @@ def process(layer_name, lineset_name):
m.blend, m.influence, m.color_ramp, m.target,
m.range_min, m.range_max))
for m in linestyle.alpha_modifiers:
- if not m.enabled:
+ if not m.use:
continue
if m.type == "ALONG_STROKE":
shaders_list.append(AlphaAlongStrokeShader(
@@ -507,7 +507,7 @@ def process(layer_name, lineset_name):
m.blend, m.influence, m.mapping, m.invert, m.curve, m.target,
m.range_min, m.range_max))
for m in linestyle.thickness_modifiers:
- if not m.enabled:
+ if not m.use:
continue
if m.type == "ALONG_STROKE":
shaders_list.append(ThicknessAlongStrokeShader(
diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py
index 4ff9a949d99..e940f454aaf 100644
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -266,7 +266,7 @@ class RENDER_PT_freestyle(RenderButtonsPanel, bpy.types.Panel):
box = layout.box()
box.context_pointer_set("freestyle_module", module)
row = box.row(align=True)
- row.prop(module, "is_displayed", text="")
+ row.prop(module, "use", text="")
row.prop(module, "module_path", text="")
row.operator("scene.freestyle_module_remove", icon='X', text="")
row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP'
@@ -296,7 +296,7 @@ class RENDER_PT_freestyle_linestyle(RenderButtonsPanel, bpy.types.Panel):
row.operator("scene.freestyle_modifier_toggle_fold", icon=icon, text="", emboss=False)
row.label(text=modifier.rna_type.name)
row.prop(modifier, "name", text="")
- row.prop(modifier, "enabled", text="")
+ row.prop(modifier, "use", text="")
sub = row.row(align=True)
sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP'
sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'