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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-21 22:58:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-21 22:58:19 +0300
commitf2c54df625d65c40f6070294a5f66de3f2d18c10 (patch)
tree1f5b12ba40e6e9b563d84c9df5ebe47b24ead20e /intern/cycles/render/image.h
parentdc3563ff4801907ec8cd21a1589f0cb56d021a8f (diff)
Cycles: Expose image image extension mapping to the image manager
Currently only two mappings are supported by API, which is Repeat (old behavior) and new Clip behavior. Internally this extension is being converted to periodic flag which was already supported but wasn't exposed. There's no support for OpenCL yet because of the way how we pack images into a single texture. Those settings are not exposed to UI or anywhere else and there should be no functional changes so far.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 70cc4935daa..bcc58ae951b 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -55,11 +55,24 @@ public:
ImageManager();
~ImageManager();
- int add_image(const string& filename, void *builtin_data, bool animated, float frame,
- bool& is_float, bool& is_linear, InterpolationType interpolation, bool use_alpha);
+ int add_image(const string& filename,
+ void *builtin_data,
+ bool animated,
+ float frame,
+ bool& is_float,
+ bool& is_linear,
+ InterpolationType interpolation,
+ ExtensionType extension,
+ bool use_alpha);
void remove_image(int slot);
- void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation);
- void tag_reload_image(const string& filename, void *builtin_data, InterpolationType interpolation);
+ void remove_image(const string& filename,
+ void *builtin_data,
+ InterpolationType interpolation,
+ ExtensionType extension);
+ void tag_reload_image(const string& filename,
+ void *builtin_data,
+ InterpolationType interpolation,
+ ExtensionType extension);
bool is_float_image(const string& filename, void *builtin_data, bool& is_linear);
void device_update(Device *device, DeviceScene *dscene, Progress& progress);
@@ -87,6 +100,7 @@ public:
bool animated;
float frame;
InterpolationType interpolation;
+ ExtensionType extension;
int users;
};