Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: OSL build & image manager fixes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-05-31 16:21:30 +00:00
parent fc68daff58
commit 966e004bbe
9 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/image.h
View File

@@ -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);