Commit: c3e90684bf84ae0929b954b6b3044654474e9cf8 Author: Lukas Stockner Date: Mon Jul 29 11:39:46 2019 -0700 Branches: experimental-build https://developer.blender.org/rBc3e90684bf84ae0929b954b6b3044654474e9cf8
Revert "Squashed version of UDIM support, now with fixed tests" This reverts commit 81a29b8c9e575c960ef9aa16d483150d0fd7b204. =================================================================== M intern/cycles/app/cycles_xml.cpp M intern/cycles/blender/blender_session.cpp M intern/cycles/blender/blender_session.h M intern/cycles/blender/blender_shader.cpp M intern/cycles/blender/blender_sync.cpp M intern/cycles/blender/blender_util.h M intern/cycles/kernel/svm/svm.h M intern/cycles/kernel/svm/svm_image.h M intern/cycles/render/graph.cpp M intern/cycles/render/graph.h M intern/cycles/render/image.cpp M intern/cycles/render/image.h M intern/cycles/render/light.cpp M intern/cycles/render/mesh.cpp M intern/cycles/render/mesh.h M intern/cycles/render/nodes.cpp M intern/cycles/render/nodes.h M intern/cycles/render/scene.h M intern/cycles/render/shader.cpp M intern/cycles/test/render_graph_finalize_test.cpp M release/scripts/presets/keyconfig/keymap_data/blender_default.py M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py M release/scripts/startup/bl_ui/space_image.py M source/blender/blenfont/BLF_api.h M source/blender/blenfont/intern/blf.c M source/blender/blenkernel/BKE_image.h M source/blender/blenkernel/intern/bpath.c M source/blender/blenkernel/intern/image.c M source/blender/blenkernel/intern/image_save.c M source/blender/blenkernel/intern/packedFile.c M source/blender/blenlib/BLI_math_vector.h M source/blender/blenlib/intern/math_vector_inline.c M source/blender/blenloader/intern/readfile.c M source/blender/blenloader/intern/versioning_280.c M source/blender/blenloader/intern/writefile.c M source/blender/compositor/operations/COM_ViewerOperation.cpp M source/blender/draw/intern/draw_manager_data.c M source/blender/editors/include/ED_image.h M source/blender/editors/include/ED_paint.h M source/blender/editors/include/ED_screen.h M source/blender/editors/interface/interface_ops.c M source/blender/editors/object/object_bake_api.c M source/blender/editors/render/render_preview.c M source/blender/editors/screen/area.c M source/blender/editors/sculpt_paint/paint_image.c M source/blender/editors/sculpt_paint/paint_image_2d.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/paint_intern.h M source/blender/editors/space_clip/clip_draw.c M source/blender/editors/space_image/image_draw.c M source/blender/editors/space_image/image_edit.c M source/blender/editors/space_image/image_intern.h M source/blender/editors/space_image/image_ops.c M source/blender/editors/space_image/space_image.c M source/blender/gpu/GPU_material.h M source/blender/gpu/intern/gpu_codegen.c M source/blender/gpu/intern/gpu_codegen.h M source/blender/gpu/intern/gpu_draw.c M source/blender/gpu/shaders/gpu_shader_material.glsl M source/blender/imbuf/IMB_moviecache.h M source/blender/imbuf/intern/moviecache.c M source/blender/makesdna/DNA_image_types.h M source/blender/makesdna/DNA_space_types.h M source/blender/makesrna/intern/rna_image.c M source/blender/makesrna/intern/rna_image_api.c M source/blender/makesrna/intern/rna_main_api.c M source/blender/makesrna/intern/rna_space.c M source/blender/nodes/shader/nodes/node_shader_tex_environment.c M source/blender/nodes/shader/nodes/node_shader_tex_image.c =================================================================== diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 95d40c93550..1dbe8a30ff2 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -210,7 +210,7 @@ static void xml_read_shader_graph(XMLReadState &state, Shader *shader, xml_node { xml_read_node(state, shader, graph_node); - ShaderGraph *graph = new ShaderGraph(shader); + ShaderGraph *graph = new ShaderGraph(); /* local state, shader nodes can't link to nodes outside the shader graph */ XMLReader graph_reader; diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index b072416064b..dcbb101b01d 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -147,9 +147,9 @@ void BlenderSession::create_session() scene->image_manager->builtin_image_info_cb = function_bind( &BlenderSession::builtin_image_info, this, _1, _2, _3); scene->image_manager->builtin_image_pixels_cb = function_bind( - &BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4, _5, _6, _7); + &BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4, _5, _6); scene->image_manager->builtin_image_float_pixels_cb = function_bind( - &BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4, _5, _6, _7); + &BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4, _5, _6); session->scene = scene; @@ -1214,7 +1214,6 @@ void BlenderSession::builtin_image_info(const string &builtin_name, bool BlenderSession::builtin_image_pixels(const string &builtin_name, void *builtin_data, - int tile, unsigned char *pixels, const size_t pixels_size, const bool associate_alpha, @@ -1234,7 +1233,7 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name, const int height = b_image.size()[1]; const int channels = b_image.channels(); - unsigned char *image_pixels = image_get_pixels_for_frame(b_image, frame, tile); + unsigned char *image_pixels = image_get_pixels_for_frame(b_image, frame); const size_t num_pixels = ((size_t)width) * height; if (image_pixels && num_pixels * channels == pixels_size) { @@ -1281,7 +1280,6 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name, bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, void *builtin_data, - int tile, float *pixels, const size_t pixels_size, const bool, @@ -1305,7 +1303,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, const int channels = b_image.channels(); float *image_pixels; - image_pixels = image_get_float_pixels_for_frame(b_image, frame, tile); + image_pixels = image_get_float_pixels_for_frame(b_image, frame); const size_t num_pixels = ((size_t)width) * height; if (image_pixels && num_pixels * channels == pixels_size) { diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 2321ecb12ba..d57ebe76b82 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -159,14 +159,12 @@ class BlenderSession { void builtin_image_info(const string &builtin_name, void *builtin_data, ImageMetaData &metadata); bool builtin_image_pixels(const string &builtin_name, void *builtin_data, - int tile, unsigned char *pixels, const size_t pixels_size, const bool associate_alpha, const bool free_cache); bool builtin_image_float_pixels(const string &builtin_name, void *builtin_data, - int tile, float *pixels, const size_t pixels_size, const bool associate_alpha, diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 95461b87b64..f952b3025f0 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -663,14 +663,6 @@ static ShaderNode *add_node(Scene *scene, image->animated = b_image_node.image_user().use_auto_refresh(); image->alpha_type = get_image_alpha_type(b_image); - image->tiles.clear(); - BL::Image::tiles_iterator b_iter; - for (b_image.tiles.begin(b_iter); b_iter != b_image.tiles.end(); ++b_iter) { - image->tiles.push_back(b_iter->tile_number()); - printf("%d\n", b_iter->tile_number()); - } - printf("\n\n"); - /* TODO: restore */ /* TODO(sergey): Does not work properly when we change builtin type. */ #if 0 @@ -1238,7 +1230,7 @@ void BlenderSync::sync_materials(BL::Depsgraph &b_depsgraph, bool update_all) /* test if we need to sync */ if (shader_map.sync(&shader, b_mat) || shader->need_sync_object || update_all) { - ShaderGraph *graph = new ShaderGraph(shader); + ShaderGraph *graph = new ShaderGraph(); shader->name = b_mat.name().c_str(); shader->pass_id = b_mat.pass_index(); @@ -1313,7 +1305,7 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, bool update_all) if (world_recalc || update_all || b_world.ptr.data != world_map) { Shader *shader = scene->default_background; - ShaderGraph *graph = new ShaderGraph(shader); + ShaderGraph *graph = new ShaderGraph(); /* create nodes */ if (b_world && b_world.use_nodes() && b_world.node_tree()) { @@ -1403,7 +1395,7 @@ void BlenderSync::sync_lights(BL::Depsgraph &b_depsgraph, bool update_all) /* test if we need to sync */ if (shader_map.sync(&shader, b_light) || update_all) { - ShaderGraph *graph = new ShaderGraph(shader); + ShaderGraph *graph = new ShaderGraph(); /* create nodes */ if (b_light.use_nodes() && b_light.node_tree()) { diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 5d82978bd90..bac571b02ce 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -704,9 +704,6 @@ SceneParams BlenderSync::get_scene_params(BL::Scene &b_scene, bool background) params.bvh_layout = RNA_boolean_get(&cscene, "use_bvh_embree") ? BVH_LAYOUT_EMBREE : params.bvh_layout; #endif - - params.background = background; - return params; } diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index e5e19e3cdb0..c9d1dc67e54 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -34,8 +34,8 @@ extern "C" { void BKE_image_user_frame_calc(void *ima, void *iuser, int cfra); void BKE_image_user_file_path(void *iuser, void *ima, char *path); -unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame, int tile); -float *BKE_image_get_float_pixels_for_frame(void *image, int frame, int tile); +unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame); +float *BKE_image_get_float_pixels_for_frame(void *image, int frame); } CCL_NAMESPACE_BEGIN @@ -233,15 +233,8 @@ static inline int render_resolution_y(BL::RenderSettings &b_render) static inline string image_user_file_path(BL::ImageUser &iuser, BL::Image &ima, int cfra) { char filepath[1024]; - iuser.tile(0); BKE_image_user_frame_calc(NULL, iuser.ptr.data, cfra); BKE_image_user_file_path(iuser.ptr.data, ima.ptr.data, filepath); - if (ima.source() == BL::Image::source_TILED) { - char *udim_id = strstr(filepath, "1001"); - if (udim_id) { - memcpy(udim_id, "%04d", 4); - } - } return string(filepath); } @@ -251,14 +244,14 @@ static inline int image_user_frame_number(BL::ImageUser &iuser, int cfra) return iuser.frame_current(); } -static inline unsigned char *image_get_pixels_for_frame(BL::Image &image, int frame, int tile) +static inline unsigned char *image_get_pixels_for_frame(BL::Image &image, int frame) { - return BKE_image_get_pixels_for_frame(image.ptr.data, frame, tile); + return BKE_image_get_pixels_for_frame(image.ptr.data, frame); } -static inline float *image_get_float_pixels_for_frame(BL::Image &image, int frame, int tile) +static inline float *image_get_float_pixels_for_frame(BL::Image &image, int frame) { - return BKE_image_get_float_pixels_for_frame(image.ptr.data, frame, tile); + return BKE_image_get_float_pixels_for_frame(image.ptr.data, frame); } static inline void render_add_metadata(BL::RenderResult &b_rr, string name, string value) diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 92736d80b61..4a386afa5de 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -295,7 +295,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, # endif /* NODES_FEATURE(NODE_FEATURE_BUMP) */ # ifdef __TEXTURES__ case NODE_TEX_IMAGE: - svm_node_tex_image(kg, sd, stack, node, &offset); + svm_node_tex_image(kg, sd, stack, node); break; case NODE_TEX_IMAGE_BOX: svm_node_tex_image_box(kg, sd, stack, node); diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index f59d18381be..2ef64662d0e 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -18,11 +18,6 @@ CCL_NAMESPACE_BEGIN ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint flags) { - if (id == -1) { - return make_float4( - TEX_IMAGE_MISSING_R, TEX_IMAGE_MISSING_G, TEX_IMAGE_MISSING_B, TEX_IMAGE_MISSING_A); - } - float4 r @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs