[Bf-blender-cvs] [3d24ef827cb] xr-actions-D9124: Merge branch 'master' into xr-actions-D9124

[Peter Kim]

Commit: 3d24ef827cb9b70472040bd6c9031d3dca29b7da
Author: Peter Kim
Date:   Sat Oct 31 23:38:14 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB3d24ef827cb9b70472040bd6c9031d3dca29b7da

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc source/blender/editors/transform/transform_ops.c
index 6e565f402fd,9f39099ea4b..f0d8df4a7b9
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@@ -991,12 -846,10 +1002,12 @@@ static void TRANSFORM_OT_rotate(struct 
  
    /* api callbacks */
    ot->invoke = transform_invoke;
 +  ot->invoke_3d = transform_invoke_3d;
    ot->exec = transform_exec;
    ot->modal = transform_modal;
 +  ot->modal_3d = transform_modal_3d;
    ot->cancel = transform_cancel;
-   ot->poll = ED_operator_screenactive;
+   ot->poll = transform_rotate_poll;
    ot->poll_property = transform_poll_property;
  
    RNA_def_float_rotation(