[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32557] trunk/blender/source/blender/ blenkernel/intern/effect.c: [#24209] Texture Forcefields: Use Object Coordinates produces incorrect results (patch included)
Janne Karhu
jhkarh at gmail.com
Mon Oct 18 10:17:05 CEST 2010
Revision: 32557
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32557
Author: jhk
Date: 2010-10-18 10:17:04 +0200 (Mon, 18 Oct 2010)
Log Message:
-----------
[#24209] Texture Forcefields: Use Object Coordinates produces incorrect results (patch included)
* Original patch provided by Alexander Beels and modified a bit by me.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/effect.c
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2010-10-18 08:11:34 UTC (rev 32556)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2010-10-18 08:17:04 UTC (rev 32557)
@@ -264,6 +264,9 @@
eff = new_effector_cache(scene, ob, NULL, ob->pd);
+ /* make sure imat is up to date */
+ invert_m4_m4(ob->imat, ob->obmat);
+
BLI_addtail(*effectors, eff);
}
static void add_particles_to_effectors(ListBase **effectors, Scene *scene, EffectorWeights *weights, Object *ob, ParticleSystem *psys, ParticleSystem *psys_src)
@@ -774,7 +777,7 @@
}
if(eff->pd->flag & PFIELD_TEX_OBJECT) {
- mul_m4_v3(eff->ob->obmat, tex_co);
+ mul_m4_v3(eff->ob->imat, tex_co);
}
hasrgb = multitex_ext(eff->pd->tex, tex_co, NULL,NULL, 0, result);
More information about the Bf-blender-cvs
mailing list