diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-22 00:18:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-22 00:21:04 +0400 |
| commit | 88d8358f91e1306a67d59250162443194ee9edcf (patch) | |
| tree | 27b62bb88e8815389fd465373a0baadfdf46e29c /intern/cycles/render/image.h | |
| parent | 177e1ec9b22af557d669089da6063ca34479c9d2 (diff) | |
Fix T40703: cycles viewport smoke not updating when changing frame.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 3eacfa7beed..50ea346c034 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -55,7 +55,8 @@ public: ImageManager(); ~ImageManager(); - int add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear, InterpolationType interpolation, bool use_alpha); + int add_image(const string& filename, void *builtin_data, bool animated, float frame, + bool& is_float, bool& is_linear, InterpolationType interpolation, bool use_alpha); void remove_image(int slot); void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation); bool is_float_image(const string& filename, void *builtin_data, bool& is_linear); @@ -82,6 +83,7 @@ public: bool use_alpha; bool need_load; bool animated; + float frame; InterpolationType interpolation; int users; |