diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 15:04:32 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-19 15:04:32 +0400 |
| commit | 26c34fc29fe9c6d40ae085b592debf4bbb3c33ec (patch) | |
| tree | 97345c2b5b80eb50e4ce98869b49c892b34350c9 /source/blender/blenkernel/intern | |
| parent | a4078c8c1a39a0ddcbe6378e51fb781dc56d1534 (diff) | |
Merge remained parts of r57520: use use_render argument rather than G.is_rendering
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/font.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 4c29d6ebaa1..51ad7ca3a67 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -721,7 +721,7 @@ void BKE_displist_make_mball(Scene *scene, Object *ob) if (ob->type == OB_MBALL) { if (ob == BKE_mball_basis_find(scene, ob)) { - BKE_mball_polygonize(scene, ob, &ob->curve_cache->disp); + BKE_mball_polygonize(scene, ob, &ob->curve_cache->disp, false); BKE_mball_texspace_calc(ob); object_deform_mball(ob, &ob->curve_cache->disp); @@ -733,7 +733,7 @@ void BKE_displist_make_mball(Scene *scene, Object *ob) void BKE_displist_make_mball_forRender(Scene *scene, Object *ob, ListBase *dispbase) { - BKE_mball_polygonize(scene, ob, dispbase); + BKE_mball_polygonize(scene, ob, dispbase, true); BKE_mball_texspace_calc(ob); object_deform_mball(ob, dispbase); diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index c899ae1f16c..f24d84df2e8 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -1,5 +1,4 @@ /* - * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 7d44337bc14..a4b59153e2b 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -2280,7 +2280,7 @@ static void mball_count(PROCESS *process, Scene *scene, Object *basis) } } -void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) +void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase, bool for_render) { MetaBall *mb; DispList *dl; @@ -2293,7 +2293,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) 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; process.thresh = mb->thresh; @@ -2331,7 +2331,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) } /* width is size per polygonize cube */ - if (G.is_rendering) { + if (for_render) { width = mb->rendersize; } else { |