[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59655] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Fix [#36600]: Smoke subframes not working with initial velocity

[Miika Hamalainen]

Revision: 59655
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59655
Author:   miikah
Date:     2013-08-30 09:59:49 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Fix [#36600]: Smoke subframes not working with initial velocity

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	2013-08-30 09:36:41 UTC (rev 59654)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-08-30 09:59:49 UTC (rev 59655)
@@ -1142,8 +1142,8 @@
 
 					/* values */
 					output->influence[index_out] = em1.influence[index_in];
-					if (output->velocity) {
-						output->velocity[index_out] = em1.velocity[index_in];
+					if (output->velocity && em1.velocity) {
+						copy_v3_v3(&output->velocity[index_out * 3], &em1.velocity[index_in * 3]);
 					}
 				}
 
@@ -1160,9 +1160,11 @@
 					else {
 						output->influence[index_out] = MAX2(em2->influence[index_in], output->influence[index_out]);
 					}
-					if (output->velocity) {
+					if (output->velocity && em2->velocity) {
 						/* last sample replaces the velocity */
-						output->velocity[index_out] = ADD_IF_LOWER(output->velocity[index_out], em2->velocity[index_in]);
+						output->velocity[index_out * 3]		= ADD_IF_LOWER(output->velocity[index_out * 3], em2->velocity[index_in * 3]);
+						output->velocity[index_out * 3 + 1] = ADD_IF_LOWER(output->velocity[index_out * 3 + 1], em2->velocity[index_in * 3 + 1]);
+						output->velocity[index_out * 3 + 2] = ADD_IF_LOWER(output->velocity[index_out * 3 + 2], em2->velocity[index_in * 3 + 2]);
 					}
 				}
 	} // low res loop