diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 12:59:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 12:59:18 +0300 |
commit | e39b5f790d806258c26827fad18f40b5815f6b3b (patch) | |
tree | e1a00abf174950668bbc9792476441c83c1d2483 /source/blender/render/intern | |
parent | 4c07fb72ece578f535160bf719a47c802b97a2f1 (diff) |
Particles
=========
- Fix for bug #7832: boids physics crashed.
- Bugfix for child particles not getting orco texture coords.
- Allow smaller strand sizes in blender units.
- Fix for a common but harmless uninitialized value warning in
valgrind, in the event queue.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 87853be6234..d97d8293c94 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1950,6 +1950,11 @@ static int render_new_particle_system(Render *re, Object *ob, ParticleSystem *ps r_tilt=2.0f*cpa->rand[2]; + /* get orco */ + psys_particle_on_emitter(ob, psmd, + (part->childtype == PART_CHILD_FACES)? PART_FROM_FACE: PART_FROM_PARTICLE, + cpa->num,DMCACHE_ISCHILD,cpa->fuv,cpa->foffset,orco,0,0,0); + if(uvco){ layer=psmd->dm->faceData.layers + CustomData_get_layer_index(&psmd->dm->faceData,CD_MFACE); |