blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Manipulator: rename grab enum 

We'll want some 3D shapes, so name existing shapes 2D
This commit is contained in:
Campbell Barton 2017-08-10 09:44:42 +10:00
parent 5fac99ca7a
commit 7cb65cc038
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/include/ED_manipulator_library.h
View File

@ -119,8 +119,8 @@ enum {
};
enum {
ED_MANIPULATOR_GRAB_STYLE_RING = 0,
ED_MANIPULATOR_GRAB_STYLE_CROSS = 1,
ED_MANIPULATOR_GRAB_STYLE_RING_2D = 0,
ED_MANIPULATOR_GRAB_STYLE_CROSS_2D = 1,
};

12
source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
View File

@ -106,7 +106,7 @@ static void grab_geom_draw(
immUniformColor4fv(col);
if (draw_style == ED_MANIPULATOR_GRAB_STYLE_RING) {
if (draw_style == ED_MANIPULATOR_GRAB_STYLE_RING_2D) {
if (filled) {
imm_draw_circle_fill(pos, 0, 0, 1.0f, DIAL_RESOLUTION);
}
@ -114,7 +114,7 @@ static void grab_geom_draw(
imm_draw_circle_wire(pos, 0, 0, 1.0f, DIAL_RESOLUTION);
}
}
else if (draw_style == ED_MANIPULATOR_GRAB_STYLE_CROSS) {
else if (draw_style == ED_MANIPULATOR_GRAB_STYLE_CROSS_2D) {
immBegin(GWN_PRIM_LINES, 4);
immVertex2f(pos, 1.0f, 1.0f);
immVertex2f(pos, -1.0f, -1.0f);
@ -123,6 +123,9 @@ static void grab_geom_draw(
immVertex2f(pos, 1.0f, -1.0f);
immEnd();
}
else {
BLI_assert(0);
}
immUnbindProgram();
@ -304,7 +307,8 @@ static void MANIPULATOR_WT_grab_3d(wmManipulatorType *wt)
/* rna */
static EnumPropertyItem rna_enum_draw_style[] = {
{ED_MANIPULATOR_GRAB_STYLE_RING, "RING", 0, "Ring", ""},
{ED_MANIPULATOR_GRAB_STYLE_RING_2D, "RING_2D", 0, "Ring", ""},
{ED_MANIPULATOR_GRAB_STYLE_CROSS_2D, "CROSS_2D", 0, "Ring", ""},
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem rna_enum_draw_options[] = {
@ -312,7 +316,7 @@ static void MANIPULATOR_WT_grab_3d(wmManipulatorType *wt)
{0, NULL, 0, NULL, NULL}
};
RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_GRAB_STYLE_RING, "Draw Style", "");
RNA_def_enum(wt->srna, "draw_style", rna_enum_draw_style, ED_MANIPULATOR_GRAB_STYLE_RING_2D, "Draw Style", "");
RNA_def_enum_flag(wt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", "");
WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 3);

2
source/blender/editors/mesh/editmesh_bisect.c
View File

@ -626,7 +626,7 @@ static void manipulator_mesh_bisect_setup(const bContext *C, wmManipulatorGroup
UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->rotate_c->color);
RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING);
RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true);
WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true);

2
source/blender/editors/mesh/editmesh_extrude.c
View File

@ -1092,7 +1092,7 @@ static void manipulator_mesh_spin_setup(const bContext *C, wmManipulatorGroup *m
RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING);
RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true);
WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true);

2
source/blender/editors/space_node/node_manipulators.c
View File

@ -413,7 +413,7 @@ static void WIDGETGROUP_node_sbeam_setup(const bContext *UNUSED(C), wmManipulato
sbeam_group->manipulator = WM_manipulator_new("MANIPULATOR_WT_grab_3d", mgroup, NULL);
wmManipulator *mpr = sbeam_group->manipulator;
RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_CROSS);
RNA_enum_set(mpr->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_CROSS_2D);
mpr->scale_basis = 0.05f;