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:
authorLukas Stockner <lukas.stockner@freenet.de>2019-12-26 20:55:36 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2019-12-26 22:14:31 +0300
commite4413dc72bfb228b0cd8bd78891833bbd089bf8e (patch)
tree75d5cd8dc9fff5409f502d5a384d197d8bb08c6d /intern/cycles/blender/blender_shader.cpp
parentf172441e30e78be004af31217724281aa33eaac6 (diff)
Cycles: Use OIIO UDIM tag instead of %04d
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
-rw-r--r--intern/cycles/blender/blender_shader.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 215953d1f29..206058259af 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -656,7 +656,7 @@ static ShaderNode *add_node(Scene *scene,
}
else {
image->filename = image_user_file_path(
- b_image_user, b_image, b_scene.frame_current(), &image->is_tiled);
+ b_image_user, b_image, b_scene.frame_current(), true);
image->builtin_data = NULL;
}
@@ -710,7 +710,8 @@ static ShaderNode *add_node(Scene *scene,
env->builtin_data = b_image.ptr.data;
}
else {
- env->filename = image_user_file_path(b_image_user, b_image, b_scene.frame_current(), NULL);
+ env->filename = image_user_file_path(
+ b_image_user, b_image, b_scene.frame_current(), false);
env->builtin_data = NULL;
}