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

Tool System: store the fallback tool for re-use

Browse Source 
The fallback tool was run-time only data,
now it's stored in the blend file.
This commit is contained in:
Campbell Barton
2020-01-03 12:26:36 +11:00
parent a854840e76
commit a8ce9a143a
5 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesdna/DNA_workspace_types.h
View File

@@ -35,8 +35,7 @@ typedef struct bToolRef_Runtime {
char gizmo_group[64];
char data_block[64];
/** Optionally use these when not interacting directly with the primary tools gizmo. */
char idname_fallback[64];
/** Keymap for #bToolRef.idname_fallback, if set. */
char keymap_fallback[64];
/** Use to infer primary operator to use when setting accelerator keys. */
@@ -51,6 +50,9 @@ typedef struct bToolRef {
struct bToolRef *next, *prev;
char idname[64];
/** Optionally use these when not interacting directly with the primary tools gizmo. */
char idname_fallback[64];
/** Use to avoid initializing the same tool multiple times. */
short tag;

24
source/blender/makesrna/intern/rna_workspace.c
View File

@@ -192,18 +192,6 @@ static int rna_WorkSpaceTool_widget_length(PointerRNA *ptr)
return tref->runtime ? strlen(tref->runtime->gizmo_group) : 0;
}
static void rna_WorkSpaceTool_tool_fallback_get(PointerRNA *ptr, char *value)
{
bToolRef *tref = ptr->data;
strcpy(value, tref->runtime ? tref->runtime->idname_fallback : "");
}
static int rna_WorkSpaceTool_tool_fallback_length(PointerRNA *ptr)
{
bToolRef *tref = ptr->data;
return tref->runtime ? strlen(tref->runtime->idname_fallback) : 0;
}
#else /* RNA_RUNTIME */
static void rna_def_workspace_owner(BlenderRNA *brna)
@@ -270,6 +258,10 @@ static void rna_def_workspace_tool(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Identifier", "");
RNA_def_struct_name_property(srna, prop);
prop = RNA_def_property(srna, "idname_fallback", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Identifier Fallback", "");
RNA_def_struct_name_property(srna, prop);
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", "");
@@ -300,14 +292,6 @@ static void rna_def_workspace_tool(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Widget", "");
RNA_def_property_string_funcs(
prop, "rna_WorkSpaceTool_widget_get", "rna_WorkSpaceTool_widget_length", NULL);
RNA_define_verify_sdna(1);
prop = RNA_def_property(srna, "tool_fallback", PROP_STRING, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Fallback", "");
RNA_def_property_string_funcs(
prop, "rna_WorkSpaceTool_tool_fallback_get", "rna_WorkSpaceTool_tool_fallback_length", NULL);
RNA_define_verify_sdna(1);
RNA_api_workspace_tool(srna);
}

4
source/blender/makesrna/intern/rna_workspace_api.c
View File

@@ -63,7 +63,9 @@ static void rna_WorkSpaceTool_setup(ID *id,
STRNCPY(tref_rt.op, op_idname);
tref_rt.index = index;
STRNCPY(tref_rt.idname_fallback, idname_fallback);
/* While it's logical to assign both these values from setup,
* it's useful to stored this in DNA for re-use, exceptional case: write to the 'tref'. */
STRNCPY(tref->idname_fallback, idname_fallback);
STRNCPY(tref_rt.keymap_fallback, keymap_fallback);
WM_toolsystem_ref_set_from_runtime(C, (WorkSpace *)id, tref, &tref_rt, idname);

2
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@@ -366,7 +366,7 @@ void WM_toolsystem_ref_set_from_runtime(struct bContext *C,
}
}
if (use_fallback_keymap == false) {
tref->runtime->idname_fallback[0] = '\0';
tref->idname_fallback[0] = '\0';
tref->runtime->keymap_fallback[0] = '\0';
}