diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
| commit | 63c472b4f9f7eae787bf4ce36160a28a1777bc76 (patch) | |
| tree | 0e3144ddeacb83b7ff2a769af178824b1dea5563 /source/blender/render/extern/include/RE_render_ext.h | |
| parent | 9422db7796e17bc23a9544d44f2a2e00a9b7e775 (diff) | |
| parent | 296757804cc2e97a3d95b4e44a6cc5d508e1c345 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/extern/include/RE_render_ext.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_render_ext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index f296c117495..82bb265e20c 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -47,7 +47,7 @@ struct Render; /* render_texture.c */ /* used by particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */ int externtex( - struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, + const struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, const int thread, struct ImagePool *pool, const bool skip_load_image, const bool texnode_preview); 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); |