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.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 70d7fd3632d..ed2780f8471 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -83,7 +83,7 @@ class ImageManager {
float frame,
InterpolationType interpolation,
ExtensionType extension,
- bool use_alpha,
+ ImageAlphaType alpha_type,
ustring colorspace,
ImageMetaData &metadata);
void add_image_user(int flat_slot);
@@ -92,13 +92,13 @@ class ImageManager {
void *builtin_data,
InterpolationType interpolation,
ExtensionType extension,
- bool use_alpha,
+ ImageAlphaType alpha_type,
ustring colorspace);
void tag_reload_image(const string &filename,
void *builtin_data,
InterpolationType interpolation,
ExtensionType extension,
- bool use_alpha,
+ ImageAlphaType alpha_type,
ustring colorspace);
bool get_image_metadata(const string &filename,
void *builtin_data,
@@ -147,7 +147,7 @@ class ImageManager {
ImageMetaData metadata;
ustring colorspace;
- bool use_alpha;
+ ImageAlphaType alpha_type;
bool need_load;
bool animated;
float frame;