[Bf-blender-cvs] [2560e49] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: 2560e49c4ee7f4fb8a8606d0bf50df5ec9c39775
Author: Kévin Dietrich
Date:   Tue Jun 9 02:02:41 2015 +0200
Branches: openvdb
https://developer.blender.org/rB2560e49c4ee7f4fb8a8606d0bf50df5ec9c39775

Merge branch 'master' into openvdb

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/drawobject.c
index cffdfa1,5272019..66bde44
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -8021,21 -8022,10 +8022,23 @@@ void draw_object(Scene *scene, ARegion 
  #endif
  			}
  
 +			/* draw a single voxel to hint the user about the resolution of the fluid */
 +			copy_v3_v3(p0, sds->p0);
 +
 +			if (sds->flags & MOD_SMOKE_HIGHRES) {
 +				madd_v3_v3v3fl(p1, p0, sds->cell_size, 1.0f / (sds->amplify + 1));
 +			}
 +			else {
 +				add_v3_v3v3(p1, p0, sds->cell_size);
 +			}
 +
 +			BKE_boundbox_init_from_minmax(&bb, p0, p1);
 +			draw_box(bb.vec, false);
 +
  			/* 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]);