griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Typo in GPv3 primitive enum class and function

Browse Source 
Rename `model` to `modal`.

Pull Request: https://projects.blender.org/blender/blender/pulls/121470
This commit is contained in:
Pratik Borhade
2024-05-06 11:42:50 +02:00
committed by Falk David
parent 9a3c7290a9
commit db33ee0ba7
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
View File

@@ -79,7 +79,7 @@ enum class ControlPointType : int8_t {
HandlePoint = 1,
};
enum class ModelKeyMode : int8_t {
enum class ModalKeyMode : int8_t {
Cancel = 1,
Confirm,
Extrude,
@@ -568,17 +568,17 @@ static void grease_pencil_primitive_status_indicators(bContext *C,
}
}
auto get_modal_key_str = [&](ModelKeyMode id) {
auto get_modal_key_str = [&](ModalKeyMode id) {
return WM_modalkeymap_operator_items_to_string(op->type, int(id), true).value_or("");
};
header += fmt::format(IFACE_("{}: confirm, {}: cancel, Shift: align"),
get_modal_key_str(ModelKeyMode::Confirm),
get_modal_key_str(ModelKeyMode::Cancel));
get_modal_key_str(ModalKeyMode::Confirm),
get_modal_key_str(ModalKeyMode::Cancel));
header += fmt::format(IFACE_(", {}/{}: adjust subdivisions: {}"),
get_modal_key_str(ModelKeyMode::IncreaseSubdivision),
get_modal_key_str(ModelKeyMode::DecreaseSubdivision),
get_modal_key_str(ModalKeyMode::IncreaseSubdivision),
get_modal_key_str(ModalKeyMode::DecreaseSubdivision),
int(ptd.subdivision));
if (ptd.segments == 1) {
@@ -591,13 +591,13 @@ static void grease_pencil_primitive_status_indicators(bContext *C,
PrimitiveType::Arc,
PrimitiveType::Curve))
{
header += fmt::format(IFACE_(", {}: extrude"), get_modal_key_str(ModelKeyMode::Extrude));
header += fmt::format(IFACE_(", {}: extrude"), get_modal_key_str(ModalKeyMode::Extrude));
}
header += fmt::format(IFACE_(", {}: grab, {}: rotate, {}: scale"),
get_modal_key_str(ModelKeyMode::Grab),
get_modal_key_str(ModelKeyMode::Rotate),
get_modal_key_str(ModelKeyMode::Scale));
get_modal_key_str(ModalKeyMode::Grab),
get_modal_key_str(ModalKeyMode::Rotate),
get_modal_key_str(ModalKeyMode::Scale));
ED_workspace_status_text(C, header.c_str());
}
@@ -1000,24 +1000,24 @@ static void grease_pencil_primitive_cursor_update(bContext *C,
return;
}
static int grease_pencil_primitive_event_model_map(bContext *C,
static int grease_pencil_primitive_event_modal_map(bContext *C,
wmOperator *op,
PrimitiveToolOperation &ptd,
const wmEvent *event)
{
switch (event->val) {
case int(ModelKeyMode::Cancel): {
case int(ModalKeyMode::Cancel): {
grease_pencil_primitive_undo_curves(ptd);
grease_pencil_primitive_exit(C, op);
return OPERATOR_CANCELLED;
}
case int(ModelKeyMode::Confirm): {
case int(ModalKeyMode::Confirm): {
grease_pencil_primitive_exit(C, op);
return OPERATOR_FINISHED;
}
case int(ModelKeyMode::Extrude): {
case int(ModalKeyMode::Extrude): {
if (ptd.mode == OperatorMode::Idle &&
ELEM(ptd.type, PrimitiveType::Line, PrimitiveType::Arc, PrimitiveType::Curve))
{
@@ -1063,7 +1063,7 @@ static int grease_pencil_primitive_event_model_map(bContext *C,
return OPERATOR_RUNNING_MODAL;
}
case int(ModelKeyMode::Grab): {
case int(ModalKeyMode::Grab): {
if (ptd.mode == OperatorMode::Idle) {
ptd.start_position_2d = float2(event->mval);
ptd.mode = OperatorMode::DragAll;
@@ -1072,7 +1072,7 @@ static int grease_pencil_primitive_event_model_map(bContext *C,
}
return OPERATOR_RUNNING_MODAL;
}
case int(ModelKeyMode::Rotate): {
case int(ModalKeyMode::Rotate): {
if (ptd.mode == OperatorMode::Idle) {
ptd.start_position_2d = float2(event->mval);
ptd.mode = OperatorMode::RotateAll;
@@ -1081,7 +1081,7 @@ static int grease_pencil_primitive_event_model_map(bContext *C,
}
return OPERATOR_RUNNING_MODAL;
}
case int(ModelKeyMode::Scale): {
case int(ModalKeyMode::Scale): {
if (ptd.mode == OperatorMode::Idle) {
ptd.start_position_2d = float2(event->mval);
ptd.mode = OperatorMode::ScaleAll;
@@ -1090,14 +1090,14 @@ static int grease_pencil_primitive_event_model_map(bContext *C,
}
return OPERATOR_RUNNING_MODAL;
}
case int(ModelKeyMode::IncreaseSubdivision): {
case int(ModalKeyMode::IncreaseSubdivision): {
if (event->val != KM_RELEASE) {
ptd.subdivision++;
RNA_int_set(op->ptr, "subdivision", ptd.subdivision);
}
return OPERATOR_RUNNING_MODAL;
}
case int(ModelKeyMode::DecreaseSubdivision): {
case int(ModalKeyMode::DecreaseSubdivision): {
if (event->val != KM_RELEASE) {
ptd.subdivision--;
ptd.subdivision = std::max(ptd.subdivision, 0);
@@ -1227,7 +1227,7 @@ static int grease_pencil_primitive_modal(bContext *C, wmOperator *op, const wmEv
grease_pencil_primitive_cursor_update(C, ptd, event);
if (event->type == EVT_MODAL_MAP) {
const int return_val = grease_pencil_primitive_event_model_map(C, op, ptd, event);
const int return_val = grease_pencil_primitive_event_modal_map(C, op, ptd, event);
if (return_val != OPERATOR_RUNNING_MODAL) {
return return_val;
}
@@ -1443,19 +1443,19 @@ void ED_primitivetool_modal_keymap(wmKeyConfig *keyconf)
{
using namespace blender::ed::greasepencil;
static const EnumPropertyItem modal_items[] = {
{int(ModelKeyMode::Cancel), "CANCEL", 0, "Cancel", ""},
{int(ModelKeyMode::Confirm), "CONFIRM", 0, "Confirm", ""},
{int(ModelKeyMode::Panning), "PANNING", 0, "Panning", ""},
{int(ModelKeyMode::Extrude), "EXTRUDE", 0, "Extrude", ""},
{int(ModelKeyMode::Grab), "GRAB", 0, "Grab", ""},
{int(ModelKeyMode::Rotate), "ROTATE", 0, "Rotate", ""},
{int(ModelKeyMode::Scale), "SCALE", 0, "Scale", ""},
{int(ModelKeyMode::IncreaseSubdivision),
{int(ModalKeyMode::Cancel), "CANCEL", 0, "Cancel", ""},
{int(ModalKeyMode::Confirm), "CONFIRM", 0, "Confirm", ""},
{int(ModalKeyMode::Panning), "PANNING", 0, "Panning", ""},
{int(ModalKeyMode::Extrude), "EXTRUDE", 0, "Extrude", ""},
{int(ModalKeyMode::Grab), "GRAB", 0, "Grab", ""},
{int(ModalKeyMode::Rotate), "ROTATE", 0, "Rotate", ""},
{int(ModalKeyMode::Scale), "SCALE", 0, "Scale", ""},
{int(ModalKeyMode::IncreaseSubdivision),
"INCREASE_SUBDIVISION",
0,
"increase_subdivision",
""},
{int(ModelKeyMode::DecreaseSubdivision),
{int(ModalKeyMode::DecreaseSubdivision),
"DECREASE_SUBDIVISION",
0,
"decrease_subdivision",