diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-05 15:23:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-05 15:26:57 +0300 |
| commit | 90b925f76d88760e6533611171db24e6a390faab (patch) | |
| tree | 9714becd1181644633c97fa4e70ecdb462301a22 /source/blender/render/intern/include/renderdatabase.h | |
| parent | a451c480fa8a278f6b6398a38caaf71b0b28ef6e (diff) | |
Fix T46333: Particle Info Node broken w/ BI
Patch from @a.romanov
This also fixes multiple particle systems - which never worked.
Diffstat (limited to 'source/blender/render/intern/include/renderdatabase.h')
| -rw-r--r-- | source/blender/render/intern/include/renderdatabase.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h index da45a2bfead..224974454e8 100644 --- a/source/blender/render/intern/include/renderdatabase.h +++ b/source/blender/render/intern/include/renderdatabase.h @@ -115,7 +115,9 @@ struct HaloRen *RE_inithalo_particle(struct Render *re, struct ObjectRen *obr, s struct StrandBuffer *RE_addStrandBuffer(struct ObjectRen *obr, int totvert); struct ObjectRen *RE_addRenderObject(struct Render *re, struct Object *ob, struct Object *par, int index, int psysindex, int lay); -struct ObjectInstanceRen *RE_addRenderInstance(struct Render *re, struct ObjectRen *obr, struct Object *ob, struct Object *par, int index, int psysindex, float mat[4][4], int lay); +struct ObjectInstanceRen *RE_addRenderInstance( + struct Render *re, struct ObjectRen *obr, struct Object *ob, struct Object *par, + int index, int psysindex, float mat[4][4], int lay, const struct DupliObject *dob); void RE_makeRenderInstances(struct Render *re); void RE_instance_rotate_ray_start(struct ObjectInstanceRen *obi, struct Isect *is); |