diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 06:36:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 06:38:38 +0300 |
commit | 5c2cef2c91196d1246c85fde58347fd25c95d50e (patch) | |
tree | 3e14bfd129e40f30169ab09355bde18395152123 | |
parent | ff752f6dbc00a5c67724d568eef510596953d864 (diff) |
Cleanup: match WorkSpace and WorkSpaceTool capitalization
-rw-r--r-- | source/blender/makesrna/intern/rna_workspace.c | 24 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_workspace_api.c | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index f6691e0fe26..3ae3f435ffb 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -148,25 +148,25 @@ const EnumPropertyItem *rna_WorkSpace_tools_mode_itemf( return DummyRNA_DEFAULT_items; } -static int rna_WorkspaceTool_index_get(PointerRNA *ptr) +static int rna_WorkSpaceTool_index_get(PointerRNA *ptr) { bToolRef *tref = ptr->data; return (tref->runtime) ? tref->runtime->index : 0; } -static int rna_WorkspaceTool_has_datablock_get(PointerRNA *ptr) +static int rna_WorkSpaceTool_has_datablock_get(PointerRNA *ptr) { bToolRef *tref = ptr->data; return (tref->runtime) ? (tref->runtime->data_block[0] != '\0') : false; } -static void rna_WorkspaceTool_widget_get(PointerRNA *ptr, char *value) +static void rna_WorkSpaceTool_widget_get(PointerRNA *ptr, char *value) { bToolRef *tref = ptr->data; strcpy(value, tref->runtime ? tref->runtime->gizmo_group : ""); } -static int rna_WorkspaceTool_widget_length(PointerRNA *ptr) +static int rna_WorkSpaceTool_widget_length(PointerRNA *ptr) { bToolRef *tref = ptr->data; return tref->runtime ? strlen(tref->runtime->gizmo_group) : 0; @@ -229,7 +229,7 @@ static void rna_def_workspace_tool(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - srna = RNA_def_struct(brna, "WorkspaceTool", NULL); + srna = RNA_def_struct(brna, "WorkSpaceTool", NULL); RNA_def_struct_sdna(srna, "bToolRef"); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); RNA_def_struct_ui_text(srna, "Work Space Tool", ""); @@ -242,7 +242,7 @@ static void rna_def_workspace_tool(BlenderRNA *brna) prop = RNA_def_property(srna, "index", PROP_INT, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Index", ""); - RNA_def_property_int_funcs(prop, "rna_WorkspaceTool_index_get", NULL, NULL); + RNA_def_property_int_funcs(prop, "rna_WorkSpaceTool_index_get", NULL, NULL); prop = RNA_def_property(srna, "space_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "space_type"); @@ -261,13 +261,13 @@ static void rna_def_workspace_tool(BlenderRNA *brna) prop = RNA_def_property(srna, "has_datablock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Has Datablock", ""); - RNA_def_property_boolean_funcs(prop, "rna_WorkspaceTool_has_datablock_get", NULL); + RNA_def_property_boolean_funcs(prop, "rna_WorkSpaceTool_has_datablock_get", NULL); RNA_define_verify_sdna(1); prop = RNA_def_property(srna, "widget", PROP_STRING, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Widget", ""); - RNA_def_property_string_funcs(prop, "rna_WorkspaceTool_widget_get", "rna_WorkspaceTool_widget_length", NULL); + RNA_def_property_string_funcs(prop, "rna_WorkSpaceTool_widget_get", "rna_WorkSpaceTool_widget_length", NULL); RNA_define_verify_sdna(1); RNA_api_workspace_tool(srna); @@ -292,7 +292,7 @@ static void rna_def_workspace_tools(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_boolean(func, "create", false, "Create", ""); /* return type */ - parm = RNA_def_pointer(func, "result", "WorkspaceTool", "", ""); + parm = RNA_def_pointer(func, "result", "WorkSpaceTool", "", ""); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "from_space_image_mode", "rna_WorkSpace_tools_from_space_image_mode"); @@ -301,14 +301,14 @@ static void rna_def_workspace_tools(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_boolean(func, "create", false, "Create", ""); /* return type */ - parm = RNA_def_pointer(func, "result", "WorkspaceTool", "", ""); + parm = RNA_def_pointer(func, "result", "WorkSpaceTool", "", ""); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "from_space_node", "rna_WorkSpace_tools_from_space_node"); RNA_def_function_ui_description(func, ""); RNA_def_boolean(func, "create", false, "Create", ""); /* return type */ - parm = RNA_def_pointer(func, "result", "WorkspaceTool", "", ""); + parm = RNA_def_pointer(func, "result", "WorkSpaceTool", "", ""); RNA_def_function_return(func, parm); } @@ -337,7 +337,7 @@ static void rna_def_workspace(BlenderRNA *brna) prop = RNA_def_property(srna, "tools", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "tools", NULL); - RNA_def_property_struct_type(prop, "WorkspaceTool"); + RNA_def_property_struct_type(prop, "WorkSpaceTool"); RNA_def_property_ui_text(prop, "Tools", ""); rna_def_workspace_tools(brna, prop); diff --git a/source/blender/makesrna/intern/rna_workspace_api.c b/source/blender/makesrna/intern/rna_workspace_api.c index c2e8e9a49a6..3f1a30a5075 100644 --- a/source/blender/makesrna/intern/rna_workspace_api.c +++ b/source/blender/makesrna/intern/rna_workspace_api.c @@ -41,7 +41,7 @@ #include "ED_screen.h" -static void rna_WorkspaceTool_setup( +static void rna_WorkSpaceTool_setup( ID *id, bToolRef *tref, bContext *C, @@ -66,7 +66,7 @@ static void rna_WorkspaceTool_setup( WM_toolsystem_ref_set_from_runtime(C, (WorkSpace *)id, tref, &tref_rt, name); } -static void rna_WorkspaceTool_refresh_from_context( +static void rna_WorkSpaceTool_refresh_from_context( ID *id, bToolRef *tref, Main *bmain) @@ -74,7 +74,7 @@ static void rna_WorkspaceTool_refresh_from_context( WM_toolsystem_ref_sync_from_context(bmain, (WorkSpace *)id, tref); } -static PointerRNA rna_WorkspaceTool_operator_properties( +static PointerRNA rna_WorkSpaceTool_operator_properties( bToolRef *tref, ReportList *reports, const char *idname) @@ -92,7 +92,7 @@ static PointerRNA rna_WorkspaceTool_operator_properties( return PointerRNA_NULL; } -static PointerRNA rna_WorkspaceTool_gizmo_group_properties( +static PointerRNA rna_WorkSpaceTool_gizmo_group_properties( bToolRef *tref, ReportList *reports, const char *idname) @@ -129,7 +129,7 @@ void RNA_api_workspace_tool(StructRNA *srna) PropertyRNA *parm; FunctionRNA *func; - func = RNA_def_function(srna, "setup", "rna_WorkspaceTool_setup"); + func = RNA_def_function(srna, "setup", "rna_WorkSpaceTool_setup"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Set the tool settings"); @@ -146,7 +146,7 @@ void RNA_api_workspace_tool(StructRNA *srna) RNA_def_int(func, "index", 0, INT_MIN, INT_MAX, "Index", "", INT_MIN, INT_MAX); /* Access tool operator options (optionally create). */ - func = RNA_def_function(srna, "operator_properties", "rna_WorkspaceTool_operator_properties"); + func = RNA_def_function(srna, "operator_properties", "rna_WorkSpaceTool_operator_properties"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_string(func, "operator", NULL, 0, "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -156,7 +156,7 @@ void RNA_api_workspace_tool(StructRNA *srna) RNA_def_function_return(func, parm); /* Access gizmo-group options (optionally create). */ - func = RNA_def_function(srna, "gizmo_group_properties", "rna_WorkspaceTool_gizmo_group_properties"); + func = RNA_def_function(srna, "gizmo_group_properties", "rna_WorkSpaceTool_gizmo_group_properties"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_string(func, "group", NULL, 0, "", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -165,7 +165,7 @@ void RNA_api_workspace_tool(StructRNA *srna) RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR); RNA_def_function_return(func, parm); - func = RNA_def_function(srna, "refresh_from_context", "rna_WorkspaceTool_refresh_from_context"); + func = RNA_def_function(srna, "refresh_from_context", "rna_WorkSpaceTool_refresh_from_context"); RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN); } |