[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33403] trunk/blender/source/blender/ blenkernel/intern/smoke.c: patch from JacobF on IRC, copy smoke settings.

[Campbell Barton]

Revision: 33403
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33403
Author:   campbellbarton
Date:     2010-12-01 03:28:08 +0100 (Wed, 01 Dec 2010)

Log Message:
-----------
patch from JacobF on IRC, copy smoke settings. double checked none of these are used for runtime.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-11-30 23:50:21 UTC (rev 33402)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-12-01 02:28:08 UTC (rev 33403)
@@ -773,6 +773,9 @@
 		tsmd->domain->viewsettings = smd->domain->viewsettings;
 		tsmd->domain->fluid_group = smd->domain->fluid_group;
 		tsmd->domain->coll_group = smd->domain->coll_group;
+		tsmd->domain->vorticity = smd->domain->vorticity;
+		tsmd->domain->time_scale = smd->domain->time_scale;
+		tsmd->domain->border_collisions = smd->domain->border_collisions;
 		
 		MEM_freeN(tsmd->domain->effector_weights);
 		tsmd->domain->effector_weights = MEM_dupallocN(smd->domain->effector_weights);
@@ -781,6 +784,8 @@
 		tsmd->flow->temp = smd->flow->temp;
 		tsmd->flow->psys = smd->flow->psys;
 		tsmd->flow->type = smd->flow->type;
+		tsmd->flow->flags = smd->flow->flags;
+		tsmd->flow->vel_multi = smd->flow->vel_multi;
 	} else if (tsmd->coll) {
 		;
 		/* leave it as initialised, collision settings is mostly caches */