Blender Git Loki
Git Commits -> Revision 1687023
Revision 1687023 by Lukas Toenne (master) February 5, 2014, 12:51 (GMT) |
Fix T38340 and T38473: fixed Scene pointers in Composite and Defocus nodes don't get updated based on context. As discussed in T38340 the solution is to use the current scene from context whenever feasible. Composite does not use node->id at all now, the scene which owns the compositing node tree is retrieved from context instead. Defocus node->id is made editable by the user. By default it is not set, which also will make it use the contextual scene and camera info. The node->id pointer in Defocus is **not** cleared in older blend files. This is done for backward compatibility: the node will then behave as before in untouched scenes. File Output nodes also don't store scene in node->id. This is only needed when creating a new node for initializing the file format. Reviewers: brecht, jbakker, mdewanchand Reviewed By: brecht Differential Revision: https://developer.blender.org/D290 |
Commit Details:
Full Hash: 1687023776a3ce0de41a4cfe0ebc72a5ebadabe4
Parent Commit: e9fda25
Lines Changed: +65, -67
21 Modified Paths:
/source/blender/blenkernel/BKE_node.h (+1, -3) (Diff)
/source/blender/blenkernel/intern/node.c (+0, -25) (Diff)
/source/blender/blenkernel/intern/scene.c (+11, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_260.c (+14, -0) (Diff)
/source/blender/compositor/COM_compositor.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+3, -3) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.cpp (+1, -0) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.h (+5, -0) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.cpp (+2, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CompositorNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DefocusNode.cpp (+2, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+4, -2) (Diff)
/source/blender/editors/space_node/node_edit.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+11, -3) (Diff)
/source/blender/nodes/composite/nodes/node_composite_composite.c (+0, -9) (Diff)
/source/blender/nodes/composite/nodes/node_composite_defocus.c (+2, -6) (Diff)
/source/blender/nodes/composite/nodes/node_composite_outputFile.c (+0, -2) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+2, -2) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+0, -25) (Diff)
/source/blender/blenkernel/intern/scene.c (+11, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_260.c (+14, -0) (Diff)
/source/blender/compositor/COM_compositor.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+3, -3) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.cpp (+1, -0) (Diff)
/source/blender/compositor/intern/COM_CompositorContext.h (+5, -0) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.cpp (+2, -1) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystem.h (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_CompositorNode.cpp (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_DefocusNode.cpp (+2, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+4, -2) (Diff)
/source/blender/editors/space_node/node_edit.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+11, -3) (Diff)
/source/blender/nodes/composite/nodes/node_composite_composite.c (+0, -9) (Diff)
/source/blender/nodes/composite/nodes/node_composite_defocus.c (+2, -6) (Diff)
/source/blender/nodes/composite/nodes/node_composite_outputFile.c (+0, -2) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+2, -2) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021