diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-02 10:45:46 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-02 10:47:43 +0300 |
commit | 9c183f60e1b0892614cf64db274488ff5bc61620 (patch) | |
tree | 574027e7ebd49fd240fb1a98ac45cbbad0a54df3 /source/blender/render/extern | |
parent | c593b77910cb13cd68fa60ea4a0e7a190f1064aa (diff) |
Fix T47610: Texture node in compositing nodes does not update
The issue was caused by some code accessing R from a functions which
are marked as safe for use from outside of render pipeline.
Now those functions are safe(er) for use.
Diffstat (limited to 'source/blender/render/extern')
-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 075db3a8145..2b5d0ca4e14 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -46,7 +46,7 @@ struct Scene; /* 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 int thread, struct ImagePool *pool, const bool skip_load_image); + 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); |