Commit: d1c7efd73fcf428f5bdd9dea989977902e89e6c5
Author: Lukas Tönne
Date: Wed Apr 8 20:02:42 2015 +0200
Branches: alembic
https://developer.blender.org/rBd1c7efd73fcf428f5bdd9dea989977902e89e6c5
Applying the inverse object transform for strand data is not necessary.
Particle pathcache data is in world space, but strands are stored in
object space already.
===================================================================
M intern/cycles/blender/blender_curves.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_curves.cpp
b/intern/cycles/blender/blender_curves.cpp
index ea31491..461cffc 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -194,7 +194,7 @@ static void ObtainCacheParticleSystem(Mesh *mesh,
BL::Object b_ob, BL::ParticleS
}
}
-static void ObtainCacheStrands(Mesh *mesh, BL::Scene b_scene, BL::Object
b_parent, BL::DupliObject b_dupli_ob, BL::ParticleSystem b_psys, const
Transform &itfm,
+static void ObtainCacheStrands(Mesh *mesh, BL::Scene b_scene, BL::Object
b_parent, BL::DupliObject b_dupli_ob, BL::ParticleSystem b_psys, const
Transform &/*itfm*/,
ParticleCurveData *CData, bool preview, int
&keyno, int &curvenum)
{
BL::ParticleSettings b_part((const PointerRNA)b_psys.settings().ptr);
@@ -243,7 +243,6 @@ static void ObtainCacheStrands(Mesh *mesh, BL::Scene
b_scene, BL::Object b_paren
for(int cvert = 0; cvert < numverts; ++cvert, ++ivert) {
float *co = (has_motion_state)?
b_strands.motion_state[ivert].location() : b_strands.vertices[ivert].location();
float3 cKey = make_float3(co[0], co[1], co[2]);
- cKey = transform_point(&itfm, cKey);
if(cvert > 0) {
float step_length = len(cKey - pcKey);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
