Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/blender/shader.cpp
| Show First 20 Lines • Show All 770 Lines • ▼ Show 20 Lines | if (b_image) { | ||||
| int scene_frame = b_scene.frame_current(); | int scene_frame = b_scene.frame_current(); | ||||
| int image_frame = image_user_frame_number(b_image_user, b_image, 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, b_engine.is_preview()), | new BlenderImageLoader(b_image, image_frame, b_engine.is_preview()), | ||||
| image->image_params()); | image->image_params()); | ||||
| } | } | ||||
| else { | else { | ||||
| ustring filename = ustring( | ustring filename = ustring( | ||||
| image_user_file_path(b_image_user, b_image, b_scene.frame_current(), true)); | image_user_file_path(b_image_user, b_image, b_scene.frame_current())); | ||||
| image->set_filename(filename); | image->set_filename(filename); | ||||
| } | } | ||||
| } | } | ||||
| node = image; | node = image; | ||||
| } | } | ||||
| else if (b_node.is_a(&RNA_ShaderNodeTexEnvironment)) { | else if (b_node.is_a(&RNA_ShaderNodeTexEnvironment)) { | ||||
| BL::ShaderNodeTexEnvironment b_env_node(b_node); | BL::ShaderNodeTexEnvironment b_env_node(b_node); | ||||
| BL::Image b_image(b_env_node.image()); | BL::Image b_image(b_env_node.image()); | ||||
| Show All 20 Lines | if (b_image) { | ||||
| int scene_frame = b_scene.frame_current(); | int scene_frame = b_scene.frame_current(); | ||||
| int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame); | int image_frame = image_user_frame_number(b_image_user, b_image, scene_frame); | ||||
| env->handle = scene->image_manager->add_image( | env->handle = scene->image_manager->add_image( | ||||
| new BlenderImageLoader(b_image, image_frame, b_engine.is_preview()), | new BlenderImageLoader(b_image, image_frame, b_engine.is_preview()), | ||||
| env->image_params()); | env->image_params()); | ||||
| } | } | ||||
| else { | else { | ||||
| env->set_filename( | env->set_filename( | ||||
| ustring(image_user_file_path(b_image_user, b_image, b_scene.frame_current(), false))); | ustring(image_user_file_path(b_image_user, b_image, b_scene.frame_current()))); | ||||
| } | } | ||||
| } | } | ||||
| node = env; | node = env; | ||||
| } | } | ||||
| else if (b_node.is_a(&RNA_ShaderNodeTexGradient)) { | else if (b_node.is_a(&RNA_ShaderNodeTexGradient)) { | ||||
| BL::ShaderNodeTexGradient b_gradient_node(b_node); | BL::ShaderNodeTexGradient b_gradient_node(b_node); | ||||
| GradientTextureNode *gradient = graph->create_node<GradientTextureNode>(); | GradientTextureNode *gradient = graph->create_node<GradientTextureNode>(); | ||||
| gradient->set_gradient_type((NodeGradientType)b_gradient_node.gradient_type()); | gradient->set_gradient_type((NodeGradientType)b_gradient_node.gradient_type()); | ||||
| ▲ Show 20 Lines • Show All 776 Lines • Show Last 20 Lines | |||||