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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index cb059256ce3..6ac1db9ed63 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -77,6 +77,7 @@ class ImageMetaData {
/* Set by ImageLoader.load_metadata(). */
int channels;
size_t width, height, depth;
+ size_t byte_size;
ImageDataType type;
/* Optional color space, defaults to raw. */
@@ -173,7 +174,7 @@ class ImageManager {
ImageHandle add_image(const string &filename, const ImageParams &params);
ImageHandle add_image(const string &filename,
const ImageParams &params,
- const vector<int> &tiles);
+ const array<int> &tiles);
ImageHandle add_image(ImageLoader *loader, const ImageParams &params, const bool builtin = true);
void device_update(Device *device, Scene *scene, Progress &progress);