Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 0bf06c322d0..c8996b70b38 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -53,6 +53,7 @@ public:
int add_image(const string& filename,
void *builtin_data,
bool animated,
+ int tile,
float frame,
InterpolationType interpolation,
ExtensionType extension,
@@ -61,11 +62,13 @@ public:
void remove_image(int flat_slot);
void remove_image(const string& filename,
void *builtin_data,
+ int tile,
InterpolationType interpolation,
ExtensionType extension,
bool use_alpha);
void tag_reload_image(const string& filename,
void *builtin_data,
+ int tile,
InterpolationType interpolation,
ExtensionType extension,
bool use_alpha);
@@ -107,11 +110,13 @@ public:
ImageMetaData& metadata)> builtin_image_info_cb;
function<bool(const string &filename,
void *data,
+ int tile,
unsigned char *pixels,
const size_t pixels_size,
const bool free_cache)> builtin_image_pixels_cb;
function<bool(const string &filename,
void *data,
+ int tile,
float *pixels,
const size_t pixels_size,
const bool free_cache)> builtin_image_float_pixels_cb;
@@ -125,6 +130,7 @@ public:
bool need_load;
bool animated;
float frame;
+ int tile;
InterpolationType interpolation;
ExtensionType extension;