Merging r57695 through r57725 from trunk into soc-2013-desgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 25 Jun 2013 07:27:59 +0000 (07:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 25 Jun 2013 07:27:59 +0000 (07:27 +0000)
1  2 
release/datafiles/startup.blend
source/blender/blenkernel/intern/mball.c

index e7177159fae6e18edebabcb49aecd633b843b404,c604d16829ce6a5106e895002102e33bd2a83707..805308cf6629f2517aa45ab14d2676d204bc4a0d
Binary files differ
index 19fe79569f5e98aac1b960ded2fddd376bfa255d,d09490db235be74f2c4b1669f5cd2f7829077a3c..140c4f55b055362cb050050b6f2a7b1ece3dfd67
@@@ -2282,8 -2282,8 +2282,8 @@@ void BKE_mball_polygonize(Scene *scene
        mball_count(&process, scene, ob);
  
        if (process.totelem == 0) return;
 -      if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
 +      if ((for_render == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
-       if (G.moving && mb->flag == MB_UPDATE_FAST) return;
+       if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_FAST) return;
  
        process.thresh = mb->thresh;