[Bf-blender-cvs] [53cb1a32db5] master: Cleanup: remove ED_gpencil_setup_modes from object mode set

Campbell Barton noreply at git.blender.org
Wed Jun 3 10:29:40 CEST 2020


Commit: 53cb1a32db5a47957f9670a1382eb98a952d82f0
Author: Campbell Barton
Date:   Wed Jun 3 17:31:55 2020 +1000
Branches: master
https://developer.blender.org/rB53cb1a32db5a47957f9670a1382eb98a952d82f0

Cleanup: remove ED_gpencil_setup_modes from object mode set

Grease pencil mode switching functions already call this.

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

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 62389be9f56..8fce6dce26a 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1565,14 +1565,6 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
     }
   }
 
-  /* if type is OB_GPENCIL, set cursor mode */
-  if (ob->type == OB_GPENCIL) {
-    if (ob->data) {
-      bGPdata *gpd = (bGPdata *)ob->data;
-      ED_gpencil_setup_modes(C, gpd, ob->mode);
-    }
-  }
-
   if (use_submode) {
     if (ob->type == OB_MESH) {
       if (ob->mode & OB_MODE_EDIT) {



More information about the Bf-blender-cvs mailing list