Blender Git Commit Log
Git Commits -> Revision ff79406
Revision ff79406 by Sergey Sharybin (master) September 14, 2017, 11:50 (GMT) |
Fix T52653: Render output of linked scenes conflicts with other scenes with the same name The issue was caused by render result identifier only consist of scene name, which could indeed cause conflicts. On the one hand, there are quite some areas in Blender where we need identifier to be unique to properly address things. Usually this is required for sub-data of IDs, like bones. On another hand, it's not that hard to support this particular case and avoid possible frustration. The idea is, we add library name to render identifier for linked scenes. We use library name and not pointer so we preserve render results through undo stack. Reviewers: campbellbarton, mont29, brecht Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2836 |
Commit Details:
Full Hash: ff7940640433d65ef3fc9e4662ffc8a171b4a07b
Parent Commit: 09c6c6c
Lines Changed: +68, -27
18 Modified Paths:
/source/blender/blenkernel/intern/image.c (+5, -5) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_CompositorNode.cpp (+1, -0) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_CompositorOperation.cpp (+3, -2) (Diff)
/source/blender/compositor/operations/COM_CompositorOperation.h (+4, -0) (Diff)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+2, -2) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+34, -5) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -0) (Diff)
/source/creator/creator_args.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+2, -2) (Diff)
/source/blender/compositor/nodes/COM_CompositorNode.cpp (+1, -0) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_CompositorOperation.cpp (+3, -2) (Diff)
/source/blender/compositor/operations/COM_CompositorOperation.h (+4, -0) (Diff)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+2, -2) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+34, -5) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -0) (Diff)
/source/creator/creator_args.c (+2, -2) (Diff)
Master Commits
MiikaHweb | 2003-2021