[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48626] branches/soc-2012-fried_chicken/ source/blender/blenkernel/intern: * Fix: Emitting smoke from particles didn 't work after last commit.

[Miika Hamalainen]

Revision: 48626
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48626
Author:   miikah
Date:     2012-07-05 08:33:26 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
* Fix: Emitting smoke from particles didn't work after last commit.
* "Map to Bounds" is now enabled by default for new textures. One less thing to worry about when rendering adaptive domain. :p

Modified Paths:
--------------
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/texture.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-07-05 08:33:17 UTC (rev 48625)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c	2012-07-05 08:33:26 UTC (rev 48626)
@@ -953,9 +953,12 @@
 			if(psys_get_particle_state(&sim, p, &state, 0) == 0)
 				continue;
 
+			/* location */
 			pos = &particle_pos[valid_particles*3];
+			copy_v3_v3(pos, state.co);
 			smoke_pos_to_cell(sds, pos);
 
+			/* velocity */
 			copy_v3_v3(&particle_vel[valid_particles*3], state.vel);
 			mul_mat3_m4_v3(sds->imat, &particle_vel[valid_particles*3]);
 

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/texture.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/texture.c	2012-07-05 08:33:17 UTC (rev 48625)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/texture.c	2012-07-05 08:33:26 UTC (rev 48626)
@@ -572,7 +572,7 @@
 	mtex->size[1] = 1.0;
 	mtex->size[2] = 1.0;
 	mtex->tex = NULL;
-	mtex->texflag = MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE;
+	mtex->texflag = MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE | MTEX_MAPTO_BOUNDS;
 	mtex->colormodel = 0;
 	mtex->r = 1.0;
 	mtex->g = 0.0;