Commit: 5552e83b533814e7882c2236d83d77e0bc61d38a
Author: Sergey Sharybin
Date: Sat Feb 11 22:24:59 2017 +0100
Branches: master
https://developer.blender.org/rB5552e83b533814e7882c2236d83d77e0bc61d38a
Cycles: Don't use built-in API for image sequences in preview mode
Our Python API is not ready for such things at all. Better be slower
but more correct for until we improve our API.
===================================================================
M intern/cycles/blender/blender_shader.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_shader.cpp
b/intern/cycles/blender/blender_shader.cpp
index f6ec015e1b..8baa53fc2e 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -609,7 +609,8 @@ static ShaderNode *add_node(Scene *scene,
bool is_builtin = b_image.packed_file() ||
b_image.source() ==
BL::Image::source_GENERATED ||
b_image.source() ==
BL::Image::source_MOVIE ||
- b_engine.is_preview();
+ (b_engine.is_preview() &&
+ b_image.source() !=
BL::Image::source_SEQUENCE);
if(is_builtin) {
/* for builtin images we're using image
datablock name to find an image to
@@ -662,7 +663,8 @@ static ShaderNode *add_node(Scene *scene,
bool is_builtin = b_image.packed_file() ||
b_image.source() ==
BL::Image::source_GENERATED ||
b_image.source() ==
BL::Image::source_MOVIE ||
- b_engine.is_preview();
+ (b_engine.is_preview() &&
+ b_image.source() !=
BL::Image::source_SEQUENCE);
if(is_builtin) {
int scene_frame = b_scene.frame_current();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
