[Bf-blender-cvs] [9e2b85e1715] greasepencil-object: Cleanup: Remove unused code to set mode

Antonio Vazquez noreply at git.blender.org
Tue Jun 6 11:28:23 CEST 2017


Commit: 9e2b85e1715e72de1f6f72c3146e1bbed6123f04
Author: Antonio Vazquez
Date:   Sun Jun 4 16:09:20 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9e2b85e1715e72de1f6f72c3146e1bbed6123f04

Cleanup: Remove unused code to set mode

This code is not used anymore in viewport with new modes

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

M	source/blender/editors/object/object_edit.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 414016b268e..2e09ecd403b 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1562,24 +1562,6 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 			}
 		}
 	}
-	///* if gpd data, but not related to OB_GPENCIL object type */
-	//if (gpd) {
-	//	/* GP Mode is not bound to a specific object. Therefore,
-	//	 * we don't want it to be actually saved on any objects,
-	//	 * as weirdness can happen if you select other objects,
-	//	 * or load old files.
-	//	 *
-	//	 * Instead, we use the following 2 rules to ensure that
-	//	 * the mode selector works as expected:
-	//	 *  1) If there's no object, we want to enter editmode.
-	//	 *     (i.e. with no object, we're in object mode)
-	//	 *  2) Otherwise, exit stroke editmode, so that we can
-	//	 *     enter another mode...
-	//	 */
-	//	if (!ob || (gpd->flag & GP_DATA_STROKE_EDITMODE)) {
-	//		WM_operator_name_call(C, "GPENCIL_OT_editmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-	//	}
-	//}
 	
 	if (!ob || !object_mode_compat_test(ob, mode))
 		return OPERATOR_PASS_THROUGH;




More information about the Bf-blender-cvs mailing list