[Bf-blender-cvs] [0c0d2f3581d] master: Fix T70406: crash editing keyframes while in sculpt mode

Brecht Van Lommel noreply at git.blender.org
Mon Oct 7 18:06:38 CEST 2019


Commit: 0c0d2f3581de6e4d153250933e2aa6b552d8c36b
Author: Brecht Van Lommel
Date:   Mon Oct 7 17:55:14 2019 +0200
Branches: master
https://developer.blender.org/rB0c0d2f3581de6e4d153250933e2aa6b552d8c36b

Fix T70406: crash editing keyframes while in sculpt mode

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 67ea0f255fc..b98c14150d5 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2346,9 +2346,11 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
     }
   }
 
-  Object *ob = CTX_data_active_object(C);
-  if (ob && ob->mode == OB_MODE_SCULPT && ob->sculpt) {
-    options |= CTX_SCULPT;
+  if (CTX_wm_view3d(C) != NULL) {
+    Object *ob = CTX_data_active_object(C);
+    if (ob && ob->mode == OB_MODE_SCULPT && ob->sculpt) {
+      options |= CTX_SCULPT;
+    }
   }
 
   t->options = options;



More information about the Bf-blender-cvs mailing list