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

Tool System: use categories for tool identifiers

Browse Source 
Tools that come with Blender use 'builtin' or 'builtin_brush' prefix.
This commit is contained in:
Campbell Barton
2019-03-15 14:18:21 +11:00
parent 3400fe3ece
commit d4156b46d7
9 changed files with 131 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,7 +475,7 @@ void WM_toolsystem_ref_sync_from_context(
const EnumPropertyItem *item = &items[i];
if (!STREQ(tref_rt->data_block, item->identifier)) {
STRNCPY(tref_rt->data_block, item->identifier);
STRNCPY(tref->idname, item->name);
SNPRINTF(tref->idname, "builtin_brush.%s", item->name);
}
}
}
@@ -488,7 +488,7 @@ void WM_toolsystem_ref_sync_from_context(
const EnumPropertyItem *item = &items[i];
if (!STREQ(tref_rt->data_block, item->identifier)) {
STRNCPY(tref_rt->data_block, item->identifier);
STRNCPY(tref->idname, item->name);
SNPRINTF(tref->idname, "builtin_brush.%s", item->name);
}
}
}
@@ -501,7 +501,7 @@ void WM_toolsystem_ref_sync_from_context(
const EnumPropertyItem *item = &items[i];
if (!STREQ(tref_rt->data_block, item->identifier)) {
STRNCPY(tref_rt->data_block, item->identifier);
STRNCPY(tref->idname, item->name);
SNPRINTF(tref->idname, "builtin_brush.%s", item->name);
}
}
}
@@ -514,7 +514,7 @@ void WM_toolsystem_ref_sync_from_context(
const EnumPropertyItem *item = &items[i];
if (!STREQ(tref_rt->data_block, item->identifier)) {
STRNCPY(tref_rt->data_block, item->identifier);
STRNCPY(tref->idname, item->name);
SNPRINTF(tref->idname, "builtin_brush.%s", item->name);
}
}
}
@@ -532,7 +532,7 @@ void WM_toolsystem_ref_sync_from_context(
const char *identifier = items[i].identifier;
if (!STREQ(tref_rt->data_block, identifier)) {
STRNCPY(tref_rt->data_block, identifier);
STRNCPY(tref->idname, name);
SNPRINTF(tref->idname, "builtin_brush.%s", name);
}
}
}
@@ -790,31 +790,31 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
case CTX_MODE_WEIGHT_GPENCIL:
case CTX_MODE_PAINT_TEXTURE:
case CTX_MODE_PAINT_GPENCIL:
return "Draw";
return "builtin_brush.Draw";
case CTX_MODE_SCULPT_GPENCIL:
return "Push";
return "builtin_brush.Push";
/* end temporary hack. */
case CTX_MODE_PARTICLE:
return "Comb";
return "builtin_brush.Comb";
case CTX_MODE_EDIT_TEXT:
return "Cursor";
return "builtin.cursor";
}
break;
case SPACE_IMAGE:
switch (tkey->mode) {
case SI_MODE_PAINT:
return "Draw";
return "builtin_brush.draw";
}
break;
case SPACE_NODE:
{
/* 'Select Box' interferes with cut-links which is handy. */
return "Select";
return "builtin.select";
}
}
return "Select Box";
return "builtin.select_box";
}
/**