blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Gizmo: use Y-axis for armature extrude on normal 

For bones it's useful to extrude a bone aligned to the existing bone.
This commit is contained in:
Campbell Barton 2018-11-21 12:12:20 +11:00
parent 04d09014e9
commit 63150511a2
Notes: blender-bot 2023-02-14 04:58:54 +01:00 
Referenced by issue #58215, GPU compute crash
Referenced by issue #58183, Cycles combined CPU + GPU render crash
Referenced by issue #57990, Crash Bug: Editing Geometry in EEVEE
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/transform/transform_gizmo_extrude_3d.c
View File

@ -77,6 +77,9 @@ typedef struct GizmoExtrudeGroup {
struct wmGizmo *adjust;
int adjust_axis;
/* Depends on object type. */
int normal_axis;
struct {
float normal_mat3[3][3]; /* use Z axis for normal. */
int orientation_type;
@ -136,12 +139,15 @@ static void gizmo_mesh_extrude_setup(const bContext *C, wmGizmoGroup *gzgroup)
const char *op_idname = NULL;
if (obedit->type == OB_MESH) {
op_idname = "MESH_OT_extrude_context_move";
ggd->normal_axis = 2;
}
else if (obedit->type == OB_ARMATURE) {
op_idname = "ARMATURE_OT_extrude_move";
ggd->normal_axis = 1;
}
else if (obedit->type == OB_CURVE) {
op_idname = "CURVE_OT_extrude_move";
ggd->normal_axis = 2;
}
else {
BLI_assert(0);
@ -168,7 +174,7 @@ static void gizmo_mesh_extrude_setup(const bContext *C, wmGizmoGroup *gzgroup)
PointerRNA *ptr = WM_gizmo_operator_set(ggd->invoke_xyz_no[i], 0, ggd->ot_extrude, NULL);
{
bool constraint[3] = {0, 0, 0};
constraint[MIN2(i, 2)] = 1;
constraint[(i < 3) ? i : ggd->normal_axis] = true;
PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
RNA_boolean_set(&macroptr, "release_confirm", true);
RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
@ -245,7 +251,7 @@ static void gizmo_mesh_extrude_refresh(const bContext *C, wmGizmoGroup *gzgroup)
/* Offset the add icon. */
mul_v3_v3fl(
ggd->invoke_xyz_no[3]->matrix_offset[3],
ggd->data.normal_mat3[2],
ggd->data.normal_mat3[ggd->normal_axis],
(extrude_arrow_normal_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
/* Adjust current operator. */