diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-17 19:58:05 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-17 19:58:05 +0300 |
| commit | 69e49c6f0c33743d32ba5313e735c1320911c679 (patch) | |
| tree | 0d011ae7d20e4b7f5fd4702454ed07987bfe96e4 /source/blender/makesrna | |
| parent | 5caec606deea380f7b0dcb22fcb2a1402c1bb60a (diff) | |
Make sculpt data more like vpaint/weightpaint. SculptData is now in scene->toolsettings, moved the RNA to reflect that too.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 30 |
2 files changed, 25 insertions, 8 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index c86544d397f..fa8871ff378 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -198,7 +198,7 @@ extern StructRNA RNA_Scene; extern StructRNA RNA_SceneSequence; extern StructRNA RNA_Screen; extern StructRNA RNA_ScriptLink; -extern StructRNA RNA_SculptData; +extern StructRNA RNA_Sculpt; extern StructRNA RNA_Sensor; extern StructRNA RNA_Sequence; extern StructRNA RNA_SequenceColorBalance; @@ -251,6 +251,7 @@ extern StructRNA RNA_ThemeTimeline; extern StructRNA RNA_ThemeUserInterface; extern StructRNA RNA_ThemeUserPreferences; extern StructRNA RNA_ThemeView3D; +extern StructRNA RNA_ToolSettings; extern StructRNA RNA_TouchSensor; extern StructRNA RNA_TransformSequence; extern StructRNA RNA_UVProjectModifier; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ff2ba8ed0b5..f1b13780439 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -80,12 +80,12 @@ static void rna_Scene_frame_update(bContext *C, PointerRNA *ptr) #else -void rna_def_sculptdata(BlenderRNA *brna) +void rna_def_sculpt(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - srna= RNA_def_struct(brna, "SculptData", NULL); + srna= RNA_def_struct(brna, "Sculpt", NULL); RNA_def_struct_nested(brna, srna, "Scene"); RNA_def_struct_ui_text(srna, "Sculpt", ""); @@ -122,6 +122,22 @@ void rna_def_sculptdata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Partial Redraw", "Optimize sculpting by only refreshing modified faces."); } +void rna_def_tool_settings(BlenderRNA *brna) +{ + StructRNA *srna; + PropertyRNA *prop; + + srna= RNA_def_struct(brna, "ToolSettings", NULL); + RNA_def_struct_nested(brna, srna, "Scene"); + RNA_def_struct_ui_text(srna, "Tool Settings", ""); + + prop= RNA_def_property(srna, "sculpt", PROP_POINTER, PROP_NONE); + RNA_def_property_struct_type(prop, "Sculpt"); + RNA_def_property_ui_text(prop, "Sculpt", ""); + + rna_def_sculpt(brna); +} + void RNA_def_scene(BlenderRNA *brna) { StructRNA *srna; @@ -211,12 +227,12 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "radio"); RNA_def_property_ui_text(prop, "Radiosity", ""); - prop= RNA_def_property(srna, "sculpt", PROP_POINTER, PROP_NONE); - RNA_def_property_pointer_sdna(prop, NULL, "sculptdata"); - RNA_def_property_struct_type(prop, "SculptData"); - RNA_def_property_ui_text(prop, "Sculpt", ""); + prop= RNA_def_property(srna, "tool_settings", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "toolsettings"); + RNA_def_property_struct_type(prop, "ToolSettings"); + RNA_def_property_ui_text(prop, "Tool Settings", ""); - rna_def_sculptdata(brna); + rna_def_tool_settings(brna); } #endif |