Merge branch 'master' into wm-drag-drop-rewrite

1 files changed, 6 insertions, 9 deletions

diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c
index 114968ec83f..580a8d79d7a 100644
--- a/source/blender/editors/transform/transform_convert_nla.c
+++ b/source/blender/editors/transform/transform_convert_nla.c
@@ -26,17 +26,15 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_math.h"
 
-#include "BKE_nla.h"
 #include "BKE_context.h"
+#include "BKE_nla.h"
 #include "BKE_report.h"
 
 #include "ED_anim_api.h"
 
-#include "UI_view2d.h"
-
 #include "transform.h"
 #include "transform_convert.h"
 
@@ -73,11 +71,10 @@ void createTransNlaData(bContext *C, TransInfo *t)
 
   /* which side of the current frame should be allowed */
   if (t->mode == TFM_TIME_EXTEND) {
-    /* only side on which mouse is gets transformed */
-    float xmouse, ymouse;
-
-    UI_view2d_region_to_view(&ac.ar->v2d, t->mouse.imval[0], t->mouse.imval[1], &xmouse, &ymouse);
-    t->frame_side = (xmouse > CFRA) ? 'R' : 'L';
+    /* only side on which center is gets transformed */
+    float center[2];
+    transform_convert_center_global_v2(t, center);
+    t->frame_side = (center[0] > CFRA) ? 'R' : 'L';
   }
   else {
     /* normal transform - both sides of current frame are considered */