[Bf-blender-cvs] [1df6a98b176] master: Cleanup: minor adjustment to gizmo extrude setup

Campbell Barton noreply at git.blender.org
Tue Mar 5 01:40:19 CET 2019


Commit: 1df6a98b176f8023a26c8cd5c9680ff0b37aa0d0
Author: Campbell Barton
Date:   Tue Mar 5 11:32:46 2019 +1100
Branches: master
https://developer.blender.org/rB1df6a98b176f8023a26c8cd5c9680ff0b37aa0d0

Cleanup: minor adjustment to gizmo extrude setup

No need to access both edit & active object.

===================================================================

M	source/blender/editors/transform/transform_gizmo_extrude_3d.c

===================================================================

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;
 		}



More information about the Bf-blender-cvs mailing list