Curves: rename initial brushes
The brushes that are still called "Test" still need to be changed until they can get their correct name. Ref T96259.
This commit is contained in:
parent
010ea688f1
commit
4da282a161
Notes:
blender-bot
2023-02-14 06:00:47 +01:00
Referenced by issue #96259, Curves Sculpt Brushes
|
@ -273,7 +273,7 @@ class CombOperation : public CurvesSculptStrokeOperation {
|
|||
/**
|
||||
* Drags the tip point of each curve and resamples the rest of the curve.
|
||||
*/
|
||||
class GrowOperation : public CurvesSculptStrokeOperation {
|
||||
class SnakeHookOperation : public CurvesSculptStrokeOperation {
|
||||
private:
|
||||
float2 last_mouse_position_;
|
||||
|
||||
|
@ -936,15 +936,15 @@ static std::unique_ptr<CurvesSculptStrokeOperation> start_brush_operation(bConte
|
|||
CurvesSculpt &curves_sculpt = *scene.toolsettings->curves_sculpt;
|
||||
Brush &brush = *BKE_paint_brush(&curves_sculpt.paint);
|
||||
switch (brush.curves_sculpt_tool) {
|
||||
case CURVES_SCULPT_TOOL_TEST1:
|
||||
case CURVES_SCULPT_TOOL_COMB:
|
||||
return std::make_unique<CombOperation>();
|
||||
case CURVES_SCULPT_TOOL_TEST2:
|
||||
case CURVES_SCULPT_TOOL_DELETE:
|
||||
return std::make_unique<DeleteOperation>();
|
||||
case CURVES_SCULPT_TOOL_TEST3:
|
||||
case CURVES_SCULPT_TOOL_SNAKE_HOOK:
|
||||
return std::make_unique<SnakeHookOperation>();
|
||||
case CURVES_SCULPT_TOOL_TEST1:
|
||||
return std::make_unique<AddOperation>();
|
||||
case CURVES_SCULPT_TOOL_TEST4:
|
||||
return std::make_unique<GrowOperation>();
|
||||
case CURVES_SCULPT_TOOL_TEST5:
|
||||
case CURVES_SCULPT_TOOL_TEST2:
|
||||
return std::make_unique<ShrinkOperation>();
|
||||
}
|
||||
BLI_assert_unreachable();
|
||||
|
|
|
@ -457,11 +457,11 @@ typedef enum eBrushUVSculptTool {
|
|||
|
||||
/* Brush.curves_sculpt_tool. */
|
||||
typedef enum eBrushCurvesSculptTool {
|
||||
CURVES_SCULPT_TOOL_TEST1 = 0,
|
||||
CURVES_SCULPT_TOOL_TEST2 = 1,
|
||||
CURVES_SCULPT_TOOL_TEST3 = 2,
|
||||
CURVES_SCULPT_TOOL_TEST4 = 3,
|
||||
CURVES_SCULPT_TOOL_TEST5 = 4,
|
||||
CURVES_SCULPT_TOOL_COMB = 0,
|
||||
CURVES_SCULPT_TOOL_DELETE = 1,
|
||||
CURVES_SCULPT_TOOL_SNAKE_HOOK = 2,
|
||||
CURVES_SCULPT_TOOL_TEST1 = 3,
|
||||
CURVES_SCULPT_TOOL_TEST2 = 4,
|
||||
} eBrushCurvesSculptTool;
|
||||
|
||||
/** When #BRUSH_ACCUMULATE is used */
|
||||
|
|
|
@ -244,11 +244,11 @@ const EnumPropertyItem rna_enum_brush_gpencil_weight_types_items[] = {
|
|||
};
|
||||
|
||||
const EnumPropertyItem rna_enum_brush_curves_sculpt_tool_items[] = {
|
||||
{CURVES_SCULPT_TOOL_COMB, "COMB", ICON_NONE, "Comb", ""},
|
||||
{CURVES_SCULPT_TOOL_DELETE, "DELETE", ICON_NONE, "Delete", ""},
|
||||
{CURVES_SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", ICON_NONE, "Snake Hook", ""},
|
||||
{CURVES_SCULPT_TOOL_TEST1, "TEST1", ICON_NONE, "Test 1", ""},
|
||||
{CURVES_SCULPT_TOOL_TEST2, "TEST2", ICON_NONE, "Test 2", ""},
|
||||
{CURVES_SCULPT_TOOL_TEST3, "TEST3", ICON_NONE, "Test 3", ""},
|
||||
{CURVES_SCULPT_TOOL_TEST4, "TEST4", ICON_NONE, "Test 4", ""},
|
||||
{CURVES_SCULPT_TOOL_TEST5, "TEST5", ICON_NONE, "Test 5", ""},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
|
||||
|
|
|
@ -664,7 +664,7 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
|
|||
case CTX_MODE_VERTEX_GPENCIL:
|
||||
return "builtin_brush.Draw";
|
||||
case CTX_MODE_SCULPT_CURVES:
|
||||
return "builtin_brush.Test 1";
|
||||
return "builtin_brush.Comb";
|
||||
/* end temporary hack. */
|
||||
|
||||
case CTX_MODE_PARTICLE:
|
||||
|
|
Loading…
Reference in New Issue