[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24541] trunk/blender/source/blender/ editors/mesh: Bugfix #19871: Extrude does not extrude on normal anymore

[Joshua Leung]

Revision: 24541
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24541
Author:   aligorith
Date:     2009-11-13 02:26:13 +0100 (Fri, 13 Nov 2009)

Log Message:
-----------
Bugfix #19871: Extrude does not extrude on normal anymore

Just moving some old commented-out code over from the invoke() callback for extrude to the macro operator.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2009-11-13 01:04:01 UTC (rev 24540)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2009-11-13 01:26:13 UTC (rev 24541)
@@ -705,8 +705,7 @@
 	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
-//	int constraint_axis[3] = {0, 0, 1};
-
+	
 	extrude_mesh(scene, obedit, em, op);
 
 	BKE_mesh_end_editmesh(obedit->data, em);
@@ -714,16 +713,6 @@
 	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 
-	RNA_enum_set(op->ptr, "proportional", 0);
-	RNA_boolean_set(op->ptr, "mirror", 0);
-	
-	/* the following two should only be set when extruding faces */
-//	RNA_enum_set(op->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
-//	RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
-	
-	
-//	WM_operator_name_call(C, "TFM_OT_translate", WM_OP_INVOKE_REGION_WIN, op->ptr);
-
 	return OPERATOR_FINISHED;
 }
 

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-13 01:04:01 UTC (rev 24540)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-13 01:26:13 UTC (rev 24541)
@@ -157,6 +157,7 @@
 {
 	wmOperatorType *ot;
 	wmOperatorTypeMacro *otmacro;
+	int constraint_axis[3] = {0, 0, 1};
 
 	/*combining operators with invoke and exec portions doesn't work yet.
 	
@@ -168,17 +169,19 @@
 	ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "MESH_OT_duplicate");
 	otmacro= WM_operatortype_macro_define(ot, "TFM_OT_translate");
-	RNA_enum_set(otmacro->ptr, "proportional", 0);
+		RNA_enum_set(otmacro->ptr, "proportional", 0);
 
 	ot= WM_operatortype_append_macro("MESH_OT_rip_move", "Rip", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "MESH_OT_rip");
 	otmacro= WM_operatortype_macro_define(ot, "TFM_OT_translate");
-	RNA_enum_set(otmacro->ptr, "proportional", 0);
+		RNA_enum_set(otmacro->ptr, "proportional", 0);
 
 	ot= WM_operatortype_append_macro("MESH_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 	otmacro= WM_operatortype_macro_define(ot, "TFM_OT_translate");
-	RNA_enum_set(otmacro->ptr, "proportional", 0);
+		RNA_enum_set(otmacro->ptr, "proportional", 0);
+		RNA_enum_set(otmacro->ptr, "constraint_orientation", V3D_MANIP_NORMAL);
+		RNA_boolean_set_array(otmacro->ptr, "constraint_axis", constraint_axis);
 }
 
 /* note mesh keymap also for other space? */