[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49609] branches/soc-2012-fried_chicken/ source/blender: * Fix: smoke collision velocity got messed up if domain was moved during simulation .

[Miika Hamalainen]

Revision: 49609
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49609
Author:   miikah
Date:     2012-08-06 11:23:43 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
* Fix: smoke collision velocity got messed up if domain was moved during simulation.
* Fixed possible crash when changing smoke collision type.
* Fix: Viewport preview of high resolution smoke was drawn with too low density.

Modified Paths:
--------------
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
    branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawvolume.c

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c	2012-08-06 11:23:09 UTC (rev 49608)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c	2012-08-06 11:23:43 UTC (rev 49609)
@@ -727,7 +727,7 @@
 				sub_v3_v3v3(&vert_vel[i*3], co, &scs->verts_old[i*3]);
 				mul_v3_fl(&vert_vel[i*3], sds->dx/dt);
 			}
-			copy_v3_v3(&scs->verts_old[i*3], mvert[i].co);
+			copy_v3_v3(&scs->verts_old[i*3], co);
 		}
 
 		if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) {

Modified: branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c	2012-08-06 11:23:09 UTC (rev 49608)
+++ branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c	2012-08-06 11:23:43 UTC (rev 49609)
@@ -4405,6 +4405,7 @@
 				smd->domain = NULL;
 				smd->coll = newdataadr(fd, smd->coll);
 				if (smd->coll) {
+					smd->coll->smd = smd;
 					smd->coll->verts_old = NULL;
 					smd->coll->numverts = 0;
 					smd->coll->dm = NULL;

Modified: branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c	2012-08-06 11:23:09 UTC (rev 49608)
+++ branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c	2012-08-06 11:23:43 UTC (rev 49609)
@@ -7050,7 +7050,7 @@
 					GPU_create_smoke(smd, 1);
 					draw_smoke_volume(sds, ob, ar, sds->tex,
 								p0, p1,
-								sds->res_wt, sds->dx_wt, sds->scale*sds->maxres,
+								sds->res_wt, sds->dx, sds->scale*sds->maxres,
 								viewnormal, sds->tex_shadow, sds->tex_flame);
 					GPU_free_smoke(smd);
 				}

Modified: branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawvolume.c	2012-08-06 11:23:09 UTC (rev 49608)
+++ branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawvolume.c	2012-08-06 11:23:43 UTC (rev 49609)
@@ -451,7 +451,6 @@
 
 	/* d0 = (viewnormal[0]*cv[i][0] + viewnormal[1]*cv[i][1] + viewnormal[2]*cv[i][2]); */ /* UNUSED */
 	ds = (ABS(viewnormal[0]) * size[0] + ABS(viewnormal[1]) * size[1] + ABS(viewnormal[2]) * size[2]);
-	dd = dx*base_scale/128.f;
 	dd = MAX3(sds->global_size[0],sds->global_size[1],sds->global_size[2])/128.f;
 	n = 0;
 	good_index = i;