Fix: Smoke obstacles were sometimes processed in wrong location when adaptive domain was enabled.

1 files changed, 11 insertions, 9 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 4cbd6679f8a..b1d06c6091b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7010,15 +7010,17 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				normalize_v3(viewnormal);
 
 				
-				/* 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);
-
-				/* draw base resolution bounds */
-				/*BKE_boundbox_init_from_minmax(&bb, sds->p0, sds->p1);
-				draw_box(bb.vec);*/
+				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);
+
+					/* draw base resolution bounds */
+					/*BKE_boundbox_init_from_minmax(&bb, sds->p0, sds->p1);
+					draw_box(bb.vec);*/
+				}
 
 				/* set dynamic boundaries to draw the volume */
 				p0[0] = sds->p0[0] + sds->cell_size[0]*sds->res_min[0] + sds->obj_shift_f[0];