Commit: 9e56d75470acad4de30cc945f5ea988d0cf647c6
Author: Kévin Dietrich
Date: Mon Jan 25 15:05:45 2016 +0100
Branches: master
https://developer.blender.org/rB9e56d75470acad4de30cc945f5ea988d0cf647c6
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.
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 7120daf..8f73243 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
