Page MenuHome
Differential D8439 Diff 27327 intern/cycles/blender/blender_shader.cpp

Changeset View

Standalone View

View Options

intern/cycles/blender/blender_shader.cpp

Show First 20 Lines • Show All 672 Lines • ▼ Show 20 Lines if (b_image) {
if (is_builtin) { if (is_builtin) {
/* for builtin images we're using image datablock name to find an image to /* for builtin images we're using image datablock name to find an image to
* read pixels from later * read pixels from later
* *
* also store frame number as well, so there's no differences in handling * also store frame number as well, so there's no differences in handling
* builtin names for packed images and movies * builtin names for packed images and movies
*/ */
int scene_frame = b_scene.frame_current(); int scene_frame = b_scene.frame_current();
int image_frame = image_user_frame_number(b_image_user, scene_frame); int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame);
image->handle = scene->image_manager->add_image( image->handle = scene->image_manager->add_image(
new BlenderImageLoader(b_image, image_frame), image->image_params()); new BlenderImageLoader(b_image, image_frame), image->image_params());
} }
else { else {
image->filename = image_user_file_path( image->filename = image_user_file_path(
b_image_user, b_image, b_scene.frame_current(), true); b_image_user, b_image, b_scene.frame_current(), true);
} }
} }
Show All 18 Lines if (b_image) {
env->alpha_type = get_image_alpha_type(b_image); env->alpha_type = get_image_alpha_type(b_image);
bool is_builtin = b_image.packed_file() || b_image.source() == BL::Image::source_GENERATED || bool is_builtin = b_image.packed_file() || b_image.source() == BL::Image::source_GENERATED ||
b_image.source() == BL::Image::source_MOVIE || b_image.source() == BL::Image::source_MOVIE ||
(b_engine.is_preview() && b_image.source() != BL::Image::source_SEQUENCE); (b_engine.is_preview() && b_image.source() != BL::Image::source_SEQUENCE);
if (is_builtin) { if (is_builtin) {
int scene_frame = b_scene.frame_current(); int scene_frame = b_scene.frame_current();
int image_frame = image_user_frame_number(b_image_user, scene_frame); int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame);
env->handle = scene->image_manager->add_image(new BlenderImageLoader(b_image, image_frame), env->handle = scene->image_manager->add_image(new BlenderImageLoader(b_image, image_frame),
env->image_params()); env->image_params());
} }
else { else {
env->filename = image_user_file_path( env->filename = image_user_file_path(
b_image_user, b_image, b_scene.frame_current(), false); b_image_user, b_image, b_scene.frame_current(), false);
} }
} }
▲ Show 20 Lines • Show All 790 Lines • Show Last 20 Lines