diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
| commit | 15cb47bf91820aac3a3881e94378067472c07e1b (patch) | |
| tree | f8db8dd34c6a0b660ad1816e002c9ef3af939b00 /source/blender/render/extern | |
| parent | 9de082dbf4130b48d59e673ed276a046d97cc1e4 (diff) | |
| parent | bc788a3607eda1889c7f0fe2201116826a9394ee (diff) | |
Merge with trunk r40409
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_render_ext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index 849640a5c16..e98f481b162 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -55,10 +55,10 @@ struct ImBuf; //void RE_zbufferall_radio(struct RadView *vw, struct RNode **rg_elem, int rg_totelem, struct Render *re); /* particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */ -int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta, const int thread); +int externtex(struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, const int thread); /* particle.c */ -void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype); +void texture_rgb_blend(float in[3], const float tex[3], const float out[3], float fact, float facg, int blendtype); float texture_value_blend(float tex, float out, float fact, float facg, int blendtype); /* node_composite.c */ |