[Bf-blender-cvs] [6d8bc032528] greasepencil-object: Disable old mode switching code

Antonio Vazquez noreply at git.blender.org
Wed May 30 10:28:02 CEST 2018


Commit: 6d8bc0325282b1e9e554c5b0338044c27e300bb6
Author: Antonio Vazquez
Date:   Wed May 30 10:27:14 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6d8bc0325282b1e9e554c5b0338044c27e300bb6

Disable old mode switching code

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

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 f28946a61b0..45684d8763f 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1384,6 +1384,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 		}
 	}
 
+#if 0 /* GPXX */
 	if (gpd) {
 		/* GP Mode is not bound to a specific object. Therefore,
 		 * we don't want it to be actually saved on any objects,
@@ -1401,6 +1402,8 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
 			WM_operator_name_call(C, "GPENCIL_OT_editmode_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 		}
 	}
+#endif
+
 	
 	if (!ob || !ED_object_mode_compat_test(ob, mode))
 		return OPERATOR_PASS_THROUGH;



More information about the Bf-blender-cvs mailing list