Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2016-01-25 17:05:45 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2016-01-25 18:12:31 +0300
commit9e56d75470acad4de30cc945f5ea988d0cf647c6 (patch)
treeaa620a10397423f2c70a5d0049a50bc465a67136 /source/blender/editors/space_view3d
parente3e23f774697782424647d8a12792dbc768501ad (diff)
Smoke viewport: also draw voxel size indicator when adaptive domain is
not used. This is kinda how it was in the openvdb branch but was accidentaly put in the adaptive domain draw scope during final review.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/drawobject.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 7120daf0093..8f73243edb2 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7811,15 +7811,18 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
glLoadMatrixf(rv3d->viewmat);
glMultMatrixf(ob->obmat);
- /* draw adaptive domain bounds */
- if ((sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) && !render_override) {
- /* draw domain max bounds */
+ if (!render_override) {
BoundBox bb;
float p0[3], p1[3];
- VECSUBFAC(p0, sds->p0, sds->cell_size, sds->adapt_res);
- VECADDFAC(p1, sds->p1, sds->cell_size, sds->adapt_res);
- BKE_boundbox_init_from_minmax(&bb, p0, p1);
- draw_box(bb.vec, false);
+
+ /* draw adaptive domain bounds */
+ if ((sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN)) {
+ /* draw domain max bounds */
+ VECSUBFAC(p0, sds->p0, sds->cell_size, sds->adapt_res);
+ VECADDFAC(p1, sds->p1, sds->cell_size, sds->adapt_res);
+ BKE_boundbox_init_from_minmax(&bb, p0, p1);
+ draw_box(bb.vec, false);
+ }
#if 0
/* draw base resolution bounds */