Differential D2575 Diff 8470 intern/cycles/blender/blender_shader.cpp

Changeset View

Standalone View

intern/cycles/blender/blender_shader.cpp

Show First 20 Lines • Show All 591 Lines • ▼ Show 20 Lines	if(scene->shader_manager->use_osl()) {
node = manager->osl_node(absolute_filepath, "");		node = manager->osl_node(absolute_filepath, "");
}		}
}		}
#else		#else
(void)b_data;		(void)b_data;
(void)b_ntree;		(void)b_ntree;
#endif		#endif
}		}
		else if(b_node.is_a(&RNA_ShaderNodeTexUDIM)) {
		BL::ShaderNodeTexUDIM b_udim_node(b_node);
		BL::Image b_image(b_udim_node.image());
		BL::ImageUser b_image_user(b_udim_node.image_user());
		UDIMTextureNode *udim = new UDIMTextureNode();
		if(b_image) {
		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_image.source() != BL::Image::source_SEQUENCE);
		if(is_builtin) {
		udim->filename = "";
		}
		else {
		udim->filename = image_user_file_path(b_image_user,
		b_image,
		b_scene.frame_current());
		}
		}

		udim->use_alpha = b_image.use_alpha();
		udim->color_space = (NodeImageColorSpace)b_udim_node.color_space();
		udim->interpolation = get_image_interpolation(b_udim_node);
		udim->extension = get_image_extension(b_udim_node);

		udim->start_tile = b_udim_node.start_tile();
		udim->columns = b_udim_node.tiles_per_row();
		udim->uv_map = b_udim_node.uv_map();

		node = udim;
		}
else if(b_node.is_a(&RNA_ShaderNodeTexImage)) {		else if(b_node.is_a(&RNA_ShaderNodeTexImage)) {
BL::ShaderNodeTexImage b_image_node(b_node);		BL::ShaderNodeTexImage b_image_node(b_node);
BL::Image b_image(b_image_node.image());		BL::Image b_image(b_image_node.image());
BL::ImageUser b_image_user(b_image_node.image_user());		BL::ImageUser b_image_user(b_image_node.image_user());
ImageTextureNode *image = new ImageTextureNode();		ImageTextureNode *image = new ImageTextureNode();
if(b_image) {		if(b_image) {
/* builtin images will use callback-based reading because		/* builtin images will use callback-based reading because
* they could only be loaded correct from blender side		* they could only be loaded correct from blender side
▲ Show 20 Lines • Show All 756 Lines • Show Last 20 Lines