diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
| commit | 966e004bbea6304840cd73f262d91a5e65464e5f (patch) | |
| tree | b9d4a9e233e471e2fa143e27b26058d6093c9d56 /intern/cycles/render/image.h | |
| parent | fc68daff582664bc1ccba57b9408973c5e8d83ec (diff) | |
Cycles: OSL build & image manager fixes.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index a0bf29088b7..0d49a1e6b67 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -38,11 +38,13 @@ public: ~ImageManager(); int add_image(const string& filename); - void remove_image(int slot); + void remove_image(const string& filename); void device_update(Device *device, DeviceScene *dscene, Progress& progress); void device_free(Device *device, DeviceScene *dscene); + void set_osl_texture_system(void *texture_system); + bool need_update; private: @@ -54,6 +56,7 @@ private: }; vector<Image*> images; + void *osl_texture_system; bool file_load_image(Image *img, device_vector<uchar4>& tex_img); |