diff options
| author | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-12 06:11:44 +0300 |
|---|---|---|
| committer | Jesse Yurkovich <jesse.y@gmail.com> | 2022-05-12 06:11:44 +0300 |
| commit | 578771ae4dcb8643214c69a7b9761ca154f40f63 (patch) | |
| tree | 6f69d7ee0001034b7c6f7e359f1da80d80ae18d1 /intern/cycles/scene/osl.h | |
| parent | 8d9d5da13706b668b9bd0d631e00c9b00b73f3ea (diff) | |
UDIM: Add support for packing inside .blend files
This completes support for tiled texture packing on the Blender / Cycles
side of things.
Most of these changes fall into one of three categories:
- Updating Image handling code to pack/unpack tiled and multi-view images
- Updating Cycles to handle tiled textures through BlenderImageLoader
- Updating OSL to properly handle textures with multiple slots
Differential Revision: https://developer.blender.org/D14395
Diffstat (limited to 'intern/cycles/scene/osl.h')
| -rw-r--r-- | intern/cycles/scene/osl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/scene/osl.h b/intern/cycles/scene/osl.h index f0f97dbcaad..bf27069b1b1 100644 --- a/intern/cycles/scene/osl.h +++ b/intern/cycles/scene/osl.h @@ -147,7 +147,7 @@ class OSLCompiler { void parameter_attribute(const char *name, ustring s); void parameter_texture(const char *name, ustring filename, ustring colorspace); - void parameter_texture(const char *name, int svm_slot); + void parameter_texture(const char *name, const ImageHandle &handle); void parameter_texture_ies(const char *name, int svm_slot); ShaderType output_type() |