diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-21 17:00:51 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-21 17:00:51 +0400 |
commit | 90cdf34f560b0527b4211ebd5f941e4265bac8d0 (patch) | |
tree | c4eaddceb299f3d9e6825eeb82f40c7198995f30 /intern/cycles/render/image.h | |
parent | fde8b0f7bc4c837075b7f7d7e51028e53a7a80fe (diff) |
Fix #32796: cycles did not support image auto refresh option.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 584448647d6..4d177174971 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -51,7 +51,7 @@ public: ImageManager(); ~ImageManager(); - int add_image(const string& filename, bool& is_float); + int add_image(const string& filename, bool animated, bool& is_float); void remove_image(const string& filename); bool is_float_image(const string& filename); @@ -60,8 +60,8 @@ public: void set_osl_texture_system(void *texture_system); void set_pack_images(bool pack_images_); - void set_extended_image_limits(void); + bool set_animation_frame_update(int frame); bool need_update; @@ -70,11 +70,13 @@ private: int tex_num_float_images; int tex_image_byte_start; thread_mutex device_mutex; + int animation_frame; struct Image { string filename; bool need_load; + bool animated; int users; }; |