Commit: 83155cce5b1b2db44728680e69a009aaf371672b
Author: Sergey Sharybin
Date: Tue May 15 15:56:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB83155cce5b1b2db44728680e69a009aaf371672b
Particles: Fix uninitialized child orco passed to modifiers
Wrong cleanup done in 51b796ff152.
===================================================================
M source/blender/blenkernel/intern/particle.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index 940263ded09..bda258e7a0b 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2117,7 +2117,7 @@ static void psys_thread_create_path(ParticleTask *task,
struct ChildParticle *cp
cpa_fuv = cpa->fuv;
cpa_from = PART_FROM_FACE;
- psys_particle_on_emitter(ctx->sim.psmd, cpa_from, cpa_num,
DMCACHE_ISCHILD, cpa->fuv, foffset, co, 0, 0, orco, 0);
+ psys_particle_on_emitter(ctx->sim.psmd, cpa_from, cpa_num,
DMCACHE_ISCHILD, cpa->fuv, foffset, co, 0, 0, 0, orco);
mul_m4_v3(ob->obmat, co);
@@ -2159,7 +2159,7 @@ static void psys_thread_create_path(ParticleTask *task,
struct ChildParticle *cp
cpa_num = 0;
cpa_fuv = pa->fuv;
- psys_particle_on_emitter(ctx->sim.psmd, cpa_from, cpa_num,
DMCACHE_ISCHILD, cpa_fuv, pa->foffset, co, 0, 0, orco, 0);
+ psys_particle_on_emitter(ctx->sim.psmd, cpa_from, cpa_num,
DMCACHE_ISCHILD, cpa_fuv, pa->foffset, co, 0, 0, 0, orco);
psys_mat_hair_to_global(ob, ctx->sim.psmd->dm_final,
psys->part->from, pa, hairmat);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
