svn merge ^/trunk/blender -r47003:47047
[blender.git] / source / blender / editors / transform / transform_generics.c
index 152576e330359bba78a4dc723bc5e32b353d4a9a..985a393f238f04df1e0056d56c0e3862ff70a83c 100644 (file)
@@ -94,6 +94,7 @@
 #include "ED_view3d.h"
 #include "ED_curve.h" /* for curve_editnurbs */
 #include "ED_clip.h"
 #include "ED_view3d.h"
 #include "ED_curve.h" /* for curve_editnurbs */
 #include "ED_clip.h"
+#include "ED_screen.h"
 
 //#include "BDR_unwrapper.h"
 
 
 //#include "BDR_unwrapper.h"
 
@@ -1055,9 +1056,10 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 
        if (t->spacetype == SPACE_VIEW3D) {
                View3D *v3d = sa->spacedata.first;
 
        if (t->spacetype == SPACE_VIEW3D) {
                View3D *v3d = sa->spacedata.first;
+               bScreen *animscreen = ED_screen_animation_playing(CTX_wm_manager(C));
                
                t->view = v3d;
                
                t->view = v3d;
-               t->animtimer= CTX_wm_screen(C)->animtimer;
+               t->animtimer= (animscreen)? animscreen->animtimer: NULL;
                
                /* turn manipulator off during transform */
                // FIXME: but don't do this when USING the manipulator...
                
                /* turn manipulator off during transform */
                // FIXME: but don't do this when USING the manipulator...