Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-05 03:32:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-05 03:32:46 +0300
commit1df6a98b176f8023a26c8cd5c9680ff0b37aa0d0 (patch)
tree5b93d34ed2053962e8bc817250655aabaaad272c /source/blender/editors/transform/transform_gizmo_extrude_3d.c
parent90afe3918110c1fba4b30333f07044064f465939 (diff)
Cleanup: minor adjustment to gizmo extrude setup
No need to access both edit & active object.
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_extrude_3d.c')
-rw-r--r--source/blender/editors/transform/transform_gizmo_extrude_3d.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
index 81f4ec8c30a..3d2e7c89f2b 100644
--- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
@@ -145,23 +145,22 @@ static void gizmo_mesh_extrude_setup(const bContext *C, wmGizmoGroup *gzgroup)
}
{
- const Object *obedit = CTX_data_edit_object(C);
const char *op_idname = NULL;
/* grease pencil does not use obedit */
/* GPXX: Remove if OB_MODE_EDIT_GPENCIL is merged with OB_MODE_EDIT */
- const Object *ob = CTX_data_active_object(C);
- if ((ob) && (ob->type == OB_GPENCIL)) {
+ const Object *obact = CTX_data_active_object(C);
+ if (obact->type == OB_GPENCIL) {
op_idname = "GPENCIL_OT_extrude_move";
}
- else if (obedit->type == OB_MESH) {
+ else if (obact->type == OB_MESH) {
op_idname = "MESH_OT_extrude_context_move";
ggd->normal_axis = 2;
}
- else if (obedit->type == OB_ARMATURE) {
+ else if (obact->type == OB_ARMATURE) {
op_idname = "ARMATURE_OT_extrude_move";
ggd->normal_axis = 1;
}
- else if (obedit->type == OB_CURVE) {
+ else if (obact->type == OB_CURVE) {
op_idname = "CURVE_OT_extrude_move";
ggd->normal_axis = 2;
}