diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-11 03:34:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-11 03:34:27 +0400 |
| commit | cc77207ca464d8e790de0524f9ad03a029deeed5 (patch) | |
| tree | 47fbf12b52987851d77aed956b526f03a91e1a40 /source | |
| parent | 84f5a9a71834307e81f9386d911385e658d6d83d (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 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_linestyle.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index e0f57a259b5..390c576fe94 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1991,7 +1991,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe uiBlockSetEmboss(block, UI_EMBOSS); uiDefButR(block, OPTION, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, ptr, "use_textures", i, 0, 0, 0, 0, NULL); } - else if(RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer)) { + else if(RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer) || RNA_struct_is_a(itemptr->type, &RNA_FreestyleLineSet)) { uiItemL(sub, name, icon); uiBlockSetEmboss(block, UI_EMBOSS); uiDefButR(block, OPTION, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, itemptr, "use", 0, 0, 0, 0, 0, NULL); diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index 9867c1ed9c6..4012acfde92 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -145,9 +145,9 @@ static void rna_def_modifier_type_common(StructRNA *srna, EnumPropertyItem *modi RNA_def_property_ui_text(prop, "Influence", "Influence factor by which the modifier changes the property."); RNA_def_property_update(prop, NC_SCENE, NULL); - prop= RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "modifier.flags", LS_MODIFIER_ENABLED); - RNA_def_property_ui_text(prop, "Enabled", "True if the modifier is enabled."); + RNA_def_property_ui_text(prop, "Use", "Enable or disable this modifier during stroke rendering."); prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "modifier.flags", LS_MODIFIER_EXPANDED); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index db8ae1b4f6a..b1c8dbeb761 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1667,9 +1667,9 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE, NULL); RNA_def_struct_name_property(srna, prop); - prop= RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_LINESET_ENABLED); - RNA_def_property_ui_text(prop, "Enabled", "Enable or disable the line set."); + RNA_def_property_ui_text(prop, "Use", "Enable or disable this line set during stroke rendering."); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "select_by_visibility", PROP_BOOLEAN, PROP_NONE); @@ -1773,9 +1773,9 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Module Path", "Path to a style module file."); RNA_def_property_update(prop, NC_SCENE, NULL); - prop= RNA_def_property(srna, "is_displayed", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "is_displayed", 1); - RNA_def_property_ui_text(prop, "Is Displayed", "Enable this style module during the rendering."); + RNA_def_property_ui_text(prop, "Use", "Enable or disable this style module during stroke rendering."); RNA_def_property_update(prop, NC_SCENE, NULL); /* FreestyleSettings */ |