[Bf-blender-cvs] [c503c5f756a] master: Fix T82244: Crash when trying to use the rotate operator on the timeline

Germano Cavalcante noreply at git.blender.org
Sat Oct 31 00:14:02 CET 2020


Commit: c503c5f756aab850e8afe2513b2dc7b645cf84af
Author: Germano Cavalcante
Date:   Fri Oct 30 20:13:05 2020 -0300
Branches: master
https://developer.blender.org/rBc503c5f756aab850e8afe2513b2dc7b645cf84af

Fix T82244: Crash when trying to use the rotate operator on the timeline

Some tranform modes are not expected to be used in the `SPACE_ACTION`.

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

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

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

diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index b164d0d443f..9f39099ea4b 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -825,6 +825,17 @@ static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
   Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
 
+/* Similar to #transform_shear_poll. */
+static bool transform_rotate_poll(bContext *C)
+{
+  if (!ED_operator_screenactive(C)) {
+    return false;
+  }
+
+  ScrArea *area = CTX_wm_area(C);
+  return area && !ELEM(area->spacetype, SPACE_ACTION);
+}
+
 static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
 {
   /* identifiers */
@@ -838,7 +849,7 @@ static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
   ot->exec = transform_exec;
   ot->modal = transform_modal;
   ot->cancel = transform_cancel;
-  ot->poll = ED_operator_screenactive;
+  ot->poll = transform_rotate_poll;
   ot->poll_property = transform_poll_property;
 
   RNA_def_float_rotation(
@@ -902,6 +913,7 @@ static void TRANSFORM_OT_bend(struct wmOperatorType *ot)
   Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
 }
 
+/* Similar to #transform_rotate_poll. */
 static bool transform_shear_poll(bContext *C)
 {
   if (!ED_operator_screenactive(C)) {



More information about the Bf-blender-cvs mailing list