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

Cleanup: rename places where 3D cage gizmo uses 2D cage enums

Browse Source
This commit is contained in:
Weizhen Huang
2023-02-01 17:28:35 +01:00
parent 19fe5caf87
commit c105c49407
11 changed files with 73 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

Submodule release/scripts/addons updated: fe59d382b4...534bf3b76c

51
source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
View File

@@ -345,7 +345,7 @@ static void cage2d_draw_box_interaction(const float color[4],
}
case ED_GIZMO_CAGE2D_PART_TRANSLATE:
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
ARRAY_SET_ITEMS(verts[0], -margin[0] / 2, -margin[1] / 2);
ARRAY_SET_ITEMS(verts[1], margin[0] / 2, margin[1] / 2);
ARRAY_SET_ITEMS(verts[2], -margin[0] / 2, margin[1] / 2);
@@ -506,7 +506,7 @@ static void cage2d_draw_circle_wire(const rctf *r,
immVertex3f(pos, r->xmin, r->ymin, 0.0f);
immEnd();
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_ROTATE) {
immBegin(GPU_PRIM_LINES, 4);
immVertex3f(pos, BLI_rctf_cent_x(r), r->ymax, 0.0f);
immVertex3f(pos, BLI_rctf_cent_x(r), r->ymax + margin[1], 0.0f);
@@ -516,8 +516,8 @@ static void cage2d_draw_circle_wire(const rctf *r,
immEnd();
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
const float rad[2] = {margin[0] / 2, margin[1] / 2};
const float center[2] = {BLI_rctf_cent_x(r), BLI_rctf_cent_y(r)};
@@ -557,7 +557,7 @@ static void cage2d_draw_circle_handles(const rctf *r,
imm_draw_point_aspect_2d(pos, r->xmin, r->ymax, rad[0], rad[1], solid);
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_ROTATE) {
const float handle[2] = {
BLI_rctf_cent_x(r),
r->ymax + (margin[1] * GIZMO_MARGIN_OFFSET_SCALE),
@@ -610,7 +610,7 @@ static void gizmo_cage2d_draw_intern(wmGizmo *gz,
/* Expand for hot-spot. */
const float size[2] = {size_real[0] + margin[0] / 2, size_real[1] + margin[1] / 2};
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE) {
int scale_parts[] = {
ED_GIZMO_CAGE2D_PART_SCALE_MIN_X,
ED_GIZMO_CAGE2D_PART_SCALE_MAX_X,
@@ -628,13 +628,13 @@ static void gizmo_cage2d_draw_intern(wmGizmo *gz,
gz->color, scale_parts[i], size, margin, gz->line_width, true, draw_options);
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
const int transform_part = ED_GIZMO_CAGE2D_PART_TRANSLATE;
GPU_select_load_id(select_id | transform_part);
cage2d_draw_box_interaction(
gz->color, transform_part, size, margin, gz->line_width, true, draw_options);
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_ROTATE) {
cage2d_draw_box_interaction(gz->color,
ED_GIZMO_CAGE2D_PART_ROTATE,
size_real,
@@ -665,7 +665,7 @@ static void gizmo_cage2d_draw_intern(wmGizmo *gz,
if (gz->highlight_part == ED_GIZMO_CAGE2D_PART_TRANSLATE) {
/* Only show if we're drawing the center handle
* otherwise the entire rectangle is the hot-spot. */
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
show = true;
}
}
@@ -678,7 +678,7 @@ static void gizmo_cage2d_draw_intern(wmGizmo *gz,
gz->color, gz->highlight_part, size_real, margin, gz->line_width, false, draw_options);
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_ROTATE) {
cage2d_draw_box_interaction(gz->color,
ED_GIZMO_CAGE2D_PART_ROTATE,
size_real,
@@ -781,9 +781,9 @@ static int gizmo_cage2d_test_select(bContext *C, wmGizmo *gz, const int mval[2])
const int transform_flag = RNA_enum_get(gz->ptr, "transform");
const int draw_options = RNA_enum_get(gz->ptr, "draw_options");
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
rctf r;
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
r.xmin = -margin[0] / 2;
r.ymin = -margin[1] / 2;
r.xmax = margin[0] / 2;
@@ -802,8 +802,7 @@ static int gizmo_cage2d_test_select(bContext *C, wmGizmo *gz, const int mval[2])
}
/* if gizmo does not have a scale intersection, don't do it */
if (transform_flag &
(ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM)) {
if (transform_flag & (ED_GIZMO_CAGE_XFORM_FLAG_SCALE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM)) {
const rctf r_xmin = {
.xmin = -size[0],
.ymin = -size[1],
@@ -855,7 +854,7 @@ static int gizmo_cage2d_test_select(bContext *C, wmGizmo *gz, const int mval[2])
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_ROTATE) {
/* Rotate:
* (*) <-- hot spot is here!
* +---+
@@ -1056,7 +1055,7 @@ static int gizmo_cage2d_modal(bContext *C,
float pivot[2];
bool constrain_axis[2] = {false};
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
gizmo_rect_pivot_from_scale_part(gz->highlight_part, pivot, constrain_axis);
}
else {
@@ -1082,7 +1081,7 @@ static int gizmo_cage2d_modal(bContext *C,
scale[i] = 1.0f + ((delta_curr[i] - delta_orig[i]) / len_v3(data->orig_matrix_offset[i]));
if ((transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_SIGNED) == 0) {
if ((transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE_SIGNED) == 0) {
if (sign != signum_i(scale[i])) {
scale[i] = 0.0f;
}
@@ -1090,7 +1089,7 @@ static int gizmo_cage2d_modal(bContext *C,
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM) {
if (constrain_axis[0] == false && constrain_axis[1] == false) {
scale[1] = scale[0] = (scale[1] + scale[0]) / 2.0f;
}
@@ -1193,18 +1192,14 @@ static void GIZMO_GT_cage_2d(wmGizmoType *gzt)
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem rna_enum_transform[] = {
{ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE, "ROTATE", 0, "Rotate", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_ROTATE, "ROTATE", 0, "Rotate", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem rna_enum_draw_options[] = {
{ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE,
"XFORM_CENTER_HANDLE",
0,
"Center Handle",
""},
{ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE, "XFORM_CENTER_HANDLE", 0, "Center Handle", ""},
{0, NULL, 0, NULL, NULL},
};
static float unit_v2[2] = {1.0f, 1.0f};
@@ -1220,7 +1215,7 @@ static void GIZMO_GT_cage_2d(wmGizmoType *gzt)
RNA_def_enum_flag(gzt->srna,
"draw_options",
rna_enum_draw_options,
ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE,
ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE,
"Draw Options",
"");

48
source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
View File

@@ -6,9 +6,9 @@
*
* \name Cage Gizmo
*
* 2D Gizmo
* 3D Gizmo
*
* \brief Rectangular gizmo acting as a 'cage' around its content.
* \brief Cuboid gizmo acting as a 'cage' around its content.
* Interacting scales or translates the gizmo.
*/
@@ -111,7 +111,7 @@ static void gizmo_rect_pivot_from_scale_part(int part, float r_pt[3], bool r_con
/* -------------------------------------------------------------------- */
/** \name Box Draw Style
*
* Useful for 3D views, see: #ED_GIZMO_CAGE2D_STYLE_BOX
* Useful for 3D views, see: #ED_GIZMO_CAGE3D_STYLE_BOX
* \{ */
static void cage3d_draw_box_corners(const float r[3],
@@ -180,7 +180,7 @@ static void cage3d_draw_box_interaction(const RegionView3D *rv3d,
/* -------------------------------------------------------------------- */
/** \name Circle Draw Style
*
* Useful for 2D views, see: #ED_GIZMO_CAGE2D_STYLE_CIRCLE
* Useful for 2D views, see: #ED_GIZMO_CAGE3D_STYLE_CIRCLE
* \{ */
static void imm_draw_point_aspect_3d(uint pos, const float co[3], const float rad[3], bool solid)
@@ -213,8 +213,8 @@ static void cage3d_draw_circle_wire(const float r[3],
imm_draw_cube_wire_3d(pos, (const float[3]){0}, r);
#if 0
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
const float rad[2] = {margin[0] / 2, margin[1] / 2};
const float center[2] = {0.0f, 0.0f};
@@ -316,7 +316,7 @@ static void gizmo_cage3d_draw_intern(
const float size[3] = {UNPACK3(size_real)};
#endif
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE) {
for (int i = ED_GIZMO_CAGE3D_PART_SCALE_MIN_X_MIN_Y_MIN_Z;
i <= ED_GIZMO_CAGE3D_PART_SCALE_MAX_X_MAX_Y_MAX_Z;
i++) {
@@ -327,7 +327,7 @@ static void gizmo_cage3d_draw_intern(
cage3d_draw_box_interaction(rv3d, matrix_final, gz->color, i, size, margin);
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
const int transform_part = ED_GIZMO_CAGE3D_PART_TRANSLATE;
GPU_select_load_id(select_id | transform_part);
cage3d_draw_box_interaction(rv3d, matrix_final, gz->color, transform_part, size, margin);
@@ -342,7 +342,7 @@ static void gizmo_cage3d_draw_intern(
.ymax = size_real[1],
};
#endif
if (draw_style == ED_GIZMO_CAGE2D_STYLE_BOX) {
if (draw_style == ED_GIZMO_CAGE3D_STYLE_BOX) {
float color[4], black[3] = {0, 0, 0};
gizmo_color_get(gz, highlight, color);
@@ -356,7 +356,7 @@ static void gizmo_cage3d_draw_intern(
if (gz->highlight_part == ED_GIZMO_CAGE3D_PART_TRANSLATE) {
/* Only show if we're drawing the center handle
* otherwise the entire rectangle is the hot-spot. */
if (draw_options & ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE) {
if (draw_options & ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE) {
show = true;
}
}
@@ -369,7 +369,7 @@ static void gizmo_cage3d_draw_intern(
rv3d, matrix_final, gz->color, gz->highlight_part, size_real, margin);
}
}
else if (draw_style == ED_GIZMO_CAGE2D_STYLE_CIRCLE) {
else if (draw_style == ED_GIZMO_CAGE3D_STYLE_CIRCLE) {
float color[4], black[3] = {0, 0, 0};
gizmo_color_get(gz, highlight, color);
@@ -515,7 +515,7 @@ static int gizmo_cage3d_modal(bContext *C,
float pivot[3];
bool constrain_axis[3] = {false};
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE) {
gizmo_rect_pivot_from_scale_part(gz->highlight_part, pivot, constrain_axis);
}
else {
@@ -542,7 +542,7 @@ static int gizmo_cage3d_modal(bContext *C,
scale[i] = 1.0f + ((delta_curr[i] - delta_orig[i]) / len_v3(data->orig_matrix_offset[i]));
if ((transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_SIGNED) == 0) {
if ((transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE_SIGNED) == 0) {
if (sign != signum_i(scale[i])) {
scale[i] = 0.0f;
}
@@ -550,7 +550,7 @@ static int gizmo_cage3d_modal(bContext *C,
}
}
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM) {
if (transform_flag & ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM) {
if (constrain_axis[0] == false && constrain_axis[1] == false) {
scale[1] = scale[0] = (scale[1] + scale[0]) / 2.0f;
}
@@ -647,22 +647,18 @@ static void GIZMO_GT_cage_3d(wmGizmoType *gzt)
/* rna */
static EnumPropertyItem rna_enum_draw_style[] = {
{ED_GIZMO_CAGE2D_STYLE_BOX, "BOX", 0, "Box", ""},
{ED_GIZMO_CAGE2D_STYLE_CIRCLE, "CIRCLE", 0, "Circle", ""},
{ED_GIZMO_CAGE3D_STYLE_BOX, "BOX", 0, "Box", ""},
{ED_GIZMO_CAGE3D_STYLE_CIRCLE, "CIRCLE", 0, "Circle", ""},
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem rna_enum_transform[] = {
{ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem rna_enum_draw_options[] = {
{ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE,
"XFORM_CENTER_HANDLE",
0,
"Center Handle",
""},
{ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE, "XFORM_CENTER_HANDLE", 0, "Center Handle", ""},
{0, NULL, 0, NULL, NULL},
};
static float unit_v3[3] = {1.0f, 1.0f, 1.0f};
@@ -672,13 +668,13 @@ static void GIZMO_GT_cage_3d(wmGizmoType *gzt)
RNA_def_enum(gzt->srna,
"draw_style",
rna_enum_draw_style,
ED_GIZMO_CAGE2D_STYLE_CIRCLE,
ED_GIZMO_CAGE3D_STYLE_CIRCLE,
"Draw Style",
"");
RNA_def_enum_flag(gzt->srna,
"draw_options",
rna_enum_draw_options,
ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE,
ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE,
"Draw Options",
"");

17
source/blender/editors/include/ED_gizmo_library.h
View File

@@ -97,11 +97,11 @@ void ED_gizmo_arrow3d_set_range_fac(struct wmGizmo *gz, float range_fac);
/* Cage Gizmo */
enum {
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE = (1 << 0), /* Translates */
ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE = (1 << 1), /* Rotates */
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE = (1 << 2), /* Scales */
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM = (1 << 3), /* Scales uniformly */
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_SIGNED = (1 << 4), /* Negative scale allowed */
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE = (1 << 0), /* Translates */
ED_GIZMO_CAGE_XFORM_FLAG_ROTATE = (1 << 1), /* Rotates */
ED_GIZMO_CAGE_XFORM_FLAG_SCALE = (1 << 2), /* Scales */
ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM = (1 << 3), /* Scales uniformly */
ED_GIZMO_CAGE_XFORM_FLAG_SCALE_SIGNED = (1 << 4), /* Negative scale allowed */
};
/* draw_style */
@@ -110,11 +110,16 @@ enum {
ED_GIZMO_CAGE2D_STYLE_CIRCLE = 1,
};
enum {
ED_GIZMO_CAGE3D_STYLE_BOX = 0,
ED_GIZMO_CAGE3D_STYLE_CIRCLE = 1,
};
/* draw_options */
enum {
/** Draw a central handle (instead of having the entire area selectable)
* Needed for large rectangles that we don't want to swallow all events. */
ED_GIZMO_CAGE2D_DRAW_FLAG_XFORM_CENTER_HANDLE = (1 << 0),
ED_GIZMO_CAGE_DRAW_FLAG_XFORM_CENTER_HANDLE = (1 << 0),
};
/** #wmGizmo.highlight_part */

4
source/blender/editors/mesh/editmesh_add_gizmo.c
View File

@@ -245,8 +245,8 @@ static void gizmo_mesh_placement_setup(const bContext *C, wmGizmoGroup *gzgroup)
RNA_enum_set(ggd->cage->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE | ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE |
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_SIGNED);
ED_GIZMO_CAGE_XFORM_FLAG_SCALE | ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE |
ED_GIZMO_CAGE_XFORM_FLAG_SCALE_SIGNED);
WM_gizmo_set_flag(ggd->cage, WM_GIZMO_DRAW_VALUE, true);

4
source/blender/editors/space_node/node_gizmo.cc
View File

@@ -117,7 +117,7 @@ static void WIDGETGROUP_node_transform_setup(const bContext * /*C*/, wmGizmoGrou
RNA_enum_set(wwrapper->gizmo->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM);
gzgroup->customdata = wwrapper;
}
@@ -323,7 +323,7 @@ static void WIDGETGROUP_node_crop_setup(const bContext * /*C*/, wmGizmoGroup *gz
RNA_enum_set(crop_group->border->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE);
gzgroup->customdata = crop_group;
}

4
source/blender/editors/space_view3d/view3d_gizmo_camera.c
View File

@@ -413,7 +413,7 @@ static void WIDGETGROUP_camera_view_setup(const bContext *UNUSED(C), wmGizmoGrou
RNA_enum_set(viewgroup->border->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE);
/* Box style is more subtle in this case. */
RNA_enum_set(viewgroup->border->ptr, "draw_style", ED_GIZMO_CAGE2D_STYLE_BOX);
@@ -470,7 +470,7 @@ static void WIDGETGROUP_camera_view_refresh(const bContext *C, wmGizmoGroup *gzg
RNA_enum_set(viewgroup->border->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE);
if (rv3d->persp == RV3D_CAMOB) {
viewgroup->state.edit_border = &scene->r.border;

6
source/blender/editors/space_view3d/view3d_gizmo_empty.c
View File

@@ -120,7 +120,7 @@ static void WIDGETGROUP_empty_image_setup(const bContext *UNUSED(C), wmGizmoGrou
__func__);
igzgroup->gizmo = WM_gizmo_new("GIZMO_GT_cage_2d", gzgroup, NULL);
wmGizmo *gz = igzgroup->gizmo;
RNA_enum_set(gz->ptr, "transform", ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE);
RNA_enum_set(gz->ptr, "transform", ED_GIZMO_CAGE_XFORM_FLAG_SCALE);
gzgroup->customdata = igzgroup;
@@ -143,8 +143,8 @@ static void WIDGETGROUP_empty_image_refresh(const bContext *C, wmGizmoGroup *gzg
RNA_enum_set(gz->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE |
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE |
ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM);
igzgroup->state.ob = ob;

6
source/blender/editors/space_view3d/view3d_gizmo_light.c
View File

@@ -179,7 +179,7 @@ static void WIDGETGROUP_light_area_setup(const bContext *UNUSED(C), wmGizmoGroup
wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__);
wwrapper->gizmo = WM_gizmo_new("GIZMO_GT_cage_2d", gzgroup, NULL);
wmGizmo *gz = wwrapper->gizmo;
RNA_enum_set(gz->ptr, "transform", ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE);
RNA_enum_set(gz->ptr, "transform", ED_GIZMO_CAGE_XFORM_FLAG_SCALE);
gzgroup->customdata = wwrapper;
@@ -201,9 +201,9 @@ static void WIDGETGROUP_light_area_refresh(const bContext *C, wmGizmoGroup *gzgr
copy_m4_m4(gz->matrix_basis, ob->object_to_world);
int flag = ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE;
int flag = ED_GIZMO_CAGE_XFORM_FLAG_SCALE;
if (ELEM(la->area_shape, LA_AREA_SQUARE, LA_AREA_DISK)) {
flag |= ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM;
flag |= ED_GIZMO_CAGE_XFORM_FLAG_SCALE_UNIFORM;
}
RNA_enum_set(gz->ptr, "transform", flag);

4
source/blender/editors/transform/transform_gizmo_2d.c
View File

@@ -210,8 +210,8 @@ static GizmoGroup2D *gizmogroup2d_init(wmGizmoGroup *gzgroup)
RNA_enum_set(ggd->cage->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE |
ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE);
ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE | ED_GIZMO_CAGE_XFORM_FLAG_SCALE |
ED_GIZMO_CAGE_XFORM_FLAG_ROTATE);
return ggd;
}

5
source/blender/editors/transform/transform_gizmo_3d.c
View File

@@ -2159,9 +2159,8 @@ static void WIDGETGROUP_xform_cage_setup(const bContext *UNUSED(C), wmGizmoGroup
xgzgroup->gizmo = WM_gizmo_new_ptr(gzt_cage, gzgroup, NULL);
wmGizmo *gz = xgzgroup->gizmo;
RNA_enum_set(gz->ptr,
"transform",
ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE | ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE);
RNA_enum_set(
gz->ptr, "transform", ED_GIZMO_CAGE_XFORM_FLAG_SCALE | ED_GIZMO_CAGE_XFORM_FLAG_TRANSLATE);
gz->color[0] = 1;
gz->color_hi[0] = 1;