Merging r57729 through r57815 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Jun 2013 09:07:19 +0000 (09:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Jun 2013 09:07:19 +0000 (09:07 +0000)
1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/mball.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_internal.c
source/blender/windowmanager/intern/wm_event_system.c

index 140c4f55b055362cb050050b6f2a7b1ece3dfd67,8361f0c4f6c77ed5b622668ede583706fd48576d..afe1c0f24df952828e5d9fcff41a61dc44fc6842
@@@ -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 & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && 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;