Blender Git Loki
Git Commits -> Revision 3a95bdf
Revision 3a95bdf by Dalai Felinto (master) November 22, 2017, 09:13 (GMT) |
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919 |
Commit Details:
Full Hash: 3a95bdfc65d883e7db006fdaadb8ed2cd6553239
Parent Commit: 8ba6103
Lines Changed: +769, -932
2 Added Paths:
/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.cpp (+35, -0) (View)
/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h (+66, -0) (View)
/source/blender/freestyle/intern/scene_graph/NodeSceneLayer.h (+66, -0) (View)
2 Deleted Paths:
/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.cpp (+0, -35)
/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.h (+0, -66)
/source/blender/freestyle/intern/scene_graph/NodeSceneRenderLayer.h (+0, -66)
67 Modified Paths:
/intern/cycles/blender/addon/properties.py (+4, -4) (Diff)
/intern/cycles/blender/addon/ui.py (+9, -29) (Diff)
/intern/cycles/blender/blender_session.cpp (+3, -4) (Diff)
/intern/cycles/blender/blender_sync.cpp (+24, -26) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -1) (Diff)
/release/scripts/freestyle/modules/parameter_editor.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/clip.py (+7, -7) (Diff)
/release/scripts/startup/bl_operators/freestyle.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+0, -5) (Diff)
/source/blender/blenkernel/intern/layer.c (+15, -1) (Diff)
/source/blender/blenkernel/intern/library_query.c (+19, -23) (Diff)
/source/blender/blenkernel/intern/linestyle.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/scene.c (+24, -103) (Diff)
/source/blender/blenloader/intern/readfile.c (+32, -5) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+45, -4) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+3, -3) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+10, -12) (Diff)
/source/blender/blenloader/intern/writefile.c (+14, -13) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+3, -3) (Diff)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+6, -6) (Diff)
/source/blender/editors/animation/anim_filter.c (+8, -7) (Diff)
/source/blender/editors/render/render_internal.c (+21, -18) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+35, -35) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+3, -3) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+29, -29) (Diff)
/source/blender/freestyle/CMakeLists.txt (+2, -2) (Diff)
/source/blender/freestyle/FRS_freestyle.h (+4, -3) (Diff)
/source/blender/freestyle/intern/application/Controller.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/application/Controller.h (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+3, -3) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h (+2, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+1, -4) (Diff)
/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp (+20, -18) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneHash.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneHash.h (+2, -2) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneVisitor.h (+2, -2) (Diff)
/source/blender/gpu/GPU_material.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+12, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+9, -9) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+24, -0) (Diff)
/source/blender/makesrna/intern/rna_layer.c (+32, -22) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_render.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+68, -259) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+7, -7) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+2, -2) (Diff)
/source/blender/nodes/NOD_composite.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_engine.h (+2, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -3) (Diff)
/source/blender/render/intern/include/rendercore.h (+1, -1) (Diff)
/source/blender/render/intern/include/renderpipeline.h (+2, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+2, -2) (Diff)
/source/blender/render/intern/source/external_engine.c (+4, -4) (Diff)
/source/blender/render/intern/source/pipeline.c (+49, -47) (Diff)
/source/blender/render/intern/source/rendercore.c (+4, -4) (Diff)
/source/blender/render/intern/source/render_result.c (+45, -42) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+9, -29) (Diff)
/intern/cycles/blender/blender_session.cpp (+3, -4) (Diff)
/intern/cycles/blender/blender_sync.cpp (+24, -26) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -1) (Diff)
/release/scripts/freestyle/modules/parameter_editor.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/clip.py (+7, -7) (Diff)
/release/scripts/startup/bl_operators/freestyle.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+0, -5) (Diff)
/source/blender/blenkernel/intern/layer.c (+15, -1) (Diff)
/source/blender/blenkernel/intern/library_query.c (+19, -23) (Diff)
/source/blender/blenkernel/intern/linestyle.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/scene.c (+24, -103) (Diff)
/source/blender/blenloader/intern/readfile.c (+32, -5) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+45, -4) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+3, -3) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+10, -12) (Diff)
/source/blender/blenloader/intern/writefile.c (+14, -13) (Diff)
/source/blender/compositor/nodes/COM_RenderLayersNode.cpp (+3, -3) (Diff)
/source/blender/compositor/operations/COM_RenderLayersProg.cpp (+6, -6) (Diff)
/source/blender/editors/animation/anim_filter.c (+8, -7) (Diff)
/source/blender/editors/render/render_internal.c (+21, -18) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+35, -35) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+3, -3) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+29, -29) (Diff)
/source/blender/freestyle/CMakeLists.txt (+2, -2) (Diff)
/source/blender/freestyle/FRS_freestyle.h (+4, -3) (Diff)
/source/blender/freestyle/intern/application/Controller.cpp (+4, -4) (Diff)
/source/blender/freestyle/intern/application/Controller.h (+1, -1) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+3, -3) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h (+2, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+1, -4) (Diff)
/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp (+20, -18) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneHash.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneHash.h (+2, -2) (Diff)
/source/blender/freestyle/intern/scene_graph/SceneVisitor.h (+2, -2) (Diff)
/source/blender/gpu/GPU_material.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+12, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+9, -9) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+24, -0) (Diff)
/source/blender/makesrna/intern/rna_layer.c (+32, -22) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_render.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+68, -259) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+7, -7) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+2, -2) (Diff)
/source/blender/nodes/NOD_composite.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_engine.h (+2, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -3) (Diff)
/source/blender/render/intern/include/rendercore.h (+1, -1) (Diff)
/source/blender/render/intern/include/renderpipeline.h (+2, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+2, -2) (Diff)
/source/blender/render/intern/source/external_engine.c (+4, -4) (Diff)
/source/blender/render/intern/source/pipeline.c (+49, -47) (Diff)
/source/blender/render/intern/source/rendercore.c (+4, -4) (Diff)
/source/blender/render/intern/source/render_result.c (+45, -42) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021