diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2015-07-14 19:48:54 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-14 19:52:29 +0300 |
| commit | 38940662e540743a6a8da287390a02a9f3f76f6d (patch) | |
| tree | f29f438c5365e2ea2699853ef9510ee676273dc7 /source/blender/render/extern | |
| parent | 107e34407d0ae4120cc7a12fdb208986a0b47d8e (diff) | |
Particle Info node support for GLSL mode and the internal render.
With this patch "Particle Info" node from Cycles works in GLSL and BI
Alexander (Blend4Web Team)
Reviewers: psy-fi
Note: moved particle info to object render instance instead of
shadeinput during review - Antony.
Differential Revision: https://developer.blender.org/D1313
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 7c76f0362f4..c53fb7d1153 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -178,7 +178,7 @@ typedef struct ShadeInput { int layflag, passflag, combinedflag; struct Group *light_override; struct Material *mat_override; - + #ifdef RE_RAYCOUNTER RayCounter raycounter; #endif @@ -206,6 +206,7 @@ int multitex_nodes(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], const short thread, short which_output, struct ShadeInput *shi, struct MTex *mtex, struct ImagePool *pool); float RE_lamp_get_data(struct ShadeInput *shi, struct Object *lamp_obj, float col[4], float lv[3], float *dist, float shadow[4]); +void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]); /* shaded view and bake */ struct Render; |