[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49798] branches/soc-2012-fried_chicken/ source/blender/blenkernel/intern/smoke.c: Fix: Smoke flow texture used UV maps incorrectly.
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Sat Aug 11 12:56:31 CEST 2012
Revision: 49798
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49798
Author: miikah
Date: 2012-08-11 10:56:30 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Fix: Smoke flow texture used UV maps incorrectly. (Double size)
Modified Paths:
--------------
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.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-11 10:32:27 UTC (rev 49797)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c 2012-08-11 10:56:30 UTC (rev 49798)
@@ -1257,6 +1257,9 @@
else if (tface) {
interp_v2_v2v2v2(tex_co, tface[f_index].uv[0], tface[f_index].uv[(nearest.flags & BVH_ONQUAD) ? 2 : 1],
tface[f_index].uv[(nearest.flags & BVH_ONQUAD) ? 3 : 2], weights);
+ /* map between -1.0f and 1.0f */
+ tex_co[0] = tex_co[0] * 2.0f - 1.0f;
+ tex_co[1] = tex_co[1] * 2.0f - 1.0f;
tex_co[2] = sfs->texture_offset;
}
texres.nor = NULL;
More information about the Bf-blender-cvs
mailing list