archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r47003:47047

Browse Source
This commit is contained in:
Campbell Barton
2012-05-26 14:19:41 +00:00
parent 10c6a8ce1a 76599a4989
commit 8c89d52614
78 changed files with 1188 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/transform/transform_generics.c
View File

@@ -94,6 +94,7 @@
#include "ED_view3d.h"
#include "ED_curve.h" /* for curve_editnurbs */
#include "ED_clip.h"
#include "ED_screen.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;
bScreen *animscreen = ED_screen_animation_playing(CTX_wm_manager(C));
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...