diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-06-07 14:52:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-07 14:52:11 +0300 |
commit | de953bf7b8da46ed5be7b7bd84ea11129673daae (patch) | |
tree | 318df6c89672fcc4e381f03aad9077f2f07c0f9c /source/blender/editors | |
parent | 86bb0d1a3555bb0167d02fbcbdcdd04b277a1794 (diff) |
Don't show smoke domain when render-only enabled
D1339 from @scorpion81
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d5a811c84f5..5272019ce4d 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -8000,14 +8000,15 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short /* only draw domains */ if (smd->domain) { SmokeDomainSettings *sds = smd->domain; - float p0[3], p1[3], viewnormal[3]; - BoundBox bb; + float viewnormal[3]; glLoadMatrixf(rv3d->viewmat); glMultMatrixf(ob->obmat); /* draw adaptive domain bounds */ - if (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) { + if ((sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) && !render_override) { + float p0[3], p1[3]; + BoundBox bb; /* draw domain max bounds */ VECSUBFAC(p0, sds->p0, sds->cell_size, sds->adapt_res); VECADDFAC(p1, sds->p1, sds->cell_size, sds->adapt_res); @@ -8023,6 +8024,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short /* don't show smoke before simulation starts, this could be made an option in the future */ if (smd->domain->fluid && CFRA >= smd->domain->point_cache[0]->startframe) { + float p0[3], p1[3]; + /* get view vector */ invert_m4_m4(ob->imat, ob->obmat); mul_v3_mat3_m4v3(viewnormal, ob->imat, rv3d->viewinv[2]); |