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

More RNA renaming.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-08-21 16:26:28 +00:00
parent b6a27dafc2
commit 32302db13c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ class RENDER_PT_freestyle(RenderButtonsPanel, bpy.types.Panel):
col.label(text="Edge Detection Options:")
col.prop(freestyle, "crease_angle")
col.prop(freestyle, "sphere_radius")
col.prop(freestyle, "dkr_epsilon")
col.prop(freestyle, "kr_derivative_epsilon")
lineset = freestyle.active_lineset
@@ -205,7 +205,6 @@ class RENDER_PT_freestyle(RenderButtonsPanel, bpy.types.Panel):
rows = 2
if lineset:
rows = 5
# FIXME: scrollbar does not work correctly
row.template_list(freestyle, "linesets", freestyle, "active_lineset_index", rows=rows)
sub = row.column()
@@ -256,12 +255,12 @@ class RENDER_PT_freestyle(RenderButtonsPanel, bpy.types.Panel):
col.prop(freestyle, "crease_angle")
col.prop(freestyle, "sphere_radius")
col.prop(freestyle, "ridges_and_valleys")
col.prop(freestyle, "suggestive_contours")
col.prop(freestyle, "use_ridges_and_valleys")
col.prop(freestyle, "use_suggestive_contours")
sub = col.row()
sub.prop(freestyle, "dkr_epsilon")
sub.active = freestyle.suggestive_contours
col.prop(freestyle, "material_boundaries")
sub.prop(freestyle, "kr_derivative_epsilon")
sub.active = freestyle.use_suggestive_contours
col.prop(freestyle, "use_material_boundaries")
col.operator("scene.freestyle_module_add")
for i, module in enumerate(freestyle.modules):

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

@@ -1738,17 +1738,17 @@ static void rna_def_freestyle_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Control Mode", "Select the Freestyle control mode");
RNA_def_property_update(prop, NC_SCENE, NULL);
prop= RNA_def_property(srna, "suggestive_contours", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_suggestive_contours", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_SUGGESTIVE_CONTOURS_FLAG);
RNA_def_property_ui_text(prop, "Suggestive Contours", "Enable suggestive contours.");
RNA_def_property_update(prop, NC_SCENE, NULL);
prop= RNA_def_property(srna, "ridges_and_valleys", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_ridges_and_valleys", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_RIDGES_AND_VALLEYS_FLAG);
RNA_def_property_ui_text(prop, "Ridges and Valleys", "Enable ridges and valleys.");
RNA_def_property_update(prop, NC_SCENE, NULL);
prop= RNA_def_property(srna, "material_boundaries", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_material_boundaries", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_MATERIAL_BOUNDARIES_FLAG);
RNA_def_property_ui_text(prop, "Material Boundaries", "Enable material boundaries.");
RNA_def_property_update(prop, NC_SCENE, NULL);
@@ -1759,7 +1759,7 @@ static void rna_def_freestyle_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Sphere Radius", "Sphere radius for computing curvatures.");
RNA_def_property_update(prop, NC_SCENE, NULL);
prop= RNA_def_property(srna, "dkr_epsilon", PROP_FLOAT, PROP_NONE);
prop= RNA_def_property(srna, "kr_derivative_epsilon", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "dkr_epsilon");
RNA_def_property_range(prop, 0.0, 1000.0);
RNA_def_property_ui_text(prop, "Kr Derivative Epsilon", "Kr derivative epsilon for computing suggestive contours.");