diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-03-03 22:07:27 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-03-03 22:07:27 +0300 |
| commit | 95f74f3442ad73d6ab3c2ee70346d51fdd5662c0 (patch) | |
| tree | 5446cbea1972a97e7864b8a7a4bb02ba099c5312 /source/blender/render | |
| parent | 18afcbcb7db513fa9e27d8245ead3401570eb44e (diff) | |
Fix for [#26254] Rendering problem with group-instances of particle-instances
* Render level derived mesh (needed for proper hair rendering) was only calculated before duplication code if the particle object was a level 0 duplicator, so particles creating objects inside a dupligroup didn't work.
* I really don't see the need for the level == 0 check, so I just removed it and after some quick tests can't see any negative effects. If the check is needed for some case though then a more complicated test is needed to handle all cases.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index fbc23cbb457..bbf41f7ac6d 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4744,7 +4744,7 @@ static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, in } } - if(level == 0 && enable) { + if(enable) { /* this is to make sure we get render level duplis in groups: * the derivedmesh must be created before init_render_mesh, * since object_duplilist does dupliparticles before that */ |