diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
| commit | 43bb431548436b6b1699f795acd107de0f6b86a8 (patch) | |
| tree | f1ab16c6380b85d50fdf6bb978e5f117b0d5d118 /source/blender/blenkernel/intern/mball.c | |
| parent | b8905ba0a6731d2aba6f3487be58b338f35df5f7 (diff) | |
| parent | b174610a8461348a82454f9050bc0dee7d9ce926 (diff) | |
Merge from trunk r49601-r49907
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index f897543db18..fa5304b081a 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -2288,7 +2288,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) mb = ob->data; if (totelem == 0) return; - if (!(G.rendering) && (mb->flag == MB_UPDATE_NEVER)) return; + if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return; if (G.moving && mb->flag == MB_UPDATE_FAST) return; curindex = totindex = 0; @@ -2335,7 +2335,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) } /* width is size per polygonize cube */ - if (G.rendering) width = mb->rendersize; + if (G.is_rendering) width = mb->rendersize; else { width = mb->wiresize; if (G.moving && mb->flag == MB_UPDATE_HALFRES) width *= 2; |