Blender Git Loki
Git Commits -> Revision ce3c7e8
Revision ce3c7e8 by Dalai Felinto (master) March 30, 2017, 15:01 (GMT) |
Layers: use IDProperty and override collection properties system First this replace a custom data struct with IDProperty, and use IDProperty group merge and copying functions. Which means that a collection property setting is only created if necessary. This implements the "Layer Collection settings" override system, as suggested in the "Override Manifesto" document. The core is working, with Scene, LayerCollection and Object using a single IDProperty to store all the render settings data. Next step is to migrate this to depsgraph. Note: Clay engine "ssao_samples" was hardcoded to 32 for now. It will come back as part of "Workspace Settings" later. Many thanks for Bastien Montagne for the help with the UI template nightmare ;) Differential Revision: https://developer.blender.org/D2563 |
Commit Details:
Full Hash: ce3c7e8ff515e5bfbf70d0f4f60557e26c9d98a1
Parent Commit: 98e6963
Lines Changed: +658, -1477
34 Modified Paths:
/release/scripts/startup/bl_ui/properties_collection.py (+23, -45) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+16, -15) (Diff)
/source/blender/blenkernel/BKE_layer.h (+20, -26) (Diff)
/source/blender/blenkernel/intern/idprop.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/layer.c (+177, -458) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -6) (Diff)
/source/blender/blenkernel/intern/object.c (+10, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+8, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+9, -23) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+15, -7) (Diff)
/source/blender/blenloader/intern/writefile.c (+10, -59) (Diff)
/source/blender/draw/DRW_engine.h (+4, -7) (Diff)
/source/blender/draw/engines/clay/clay.c (+32, -93) (Diff)
/source/blender/draw/engines/clay/clay.h (+3, -2) (Diff)
/source/blender/draw/engines/eevee/eevee.c (+6, -4) (Diff)
/source/blender/draw/intern/draw_manager.c (+8, -73) (Diff)
/source/blender/draw/intern/DRW_render.h (+0, -4) (Diff)
/source/blender/draw/modes/edit_mesh_mode.c (+11, -9) (Diff)
/source/blender/draw/modes/object_mode.c (+6, -4) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_ops.c (+108, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+56, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+9, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+1, -47) (Diff)
/source/blender/makesdna/DNA_material_types.h (+0, -30) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -39) (Diff)
/source/blender/makesrna/intern/rna_material.c (+0, -143) (Diff)
/source/blender/makesrna/intern/rna_render.c (+4, -5) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+104, -363) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+9, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+0, -2) (Diff)
/source/blender/render/extern/include/RE_engine.h (+2, -2) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+16, -15) (Diff)
/source/blender/blenkernel/BKE_layer.h (+20, -26) (Diff)
/source/blender/blenkernel/intern/idprop.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/layer.c (+177, -458) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -6) (Diff)
/source/blender/blenkernel/intern/object.c (+10, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+8, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+9, -23) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+15, -7) (Diff)
/source/blender/blenloader/intern/writefile.c (+10, -59) (Diff)
/source/blender/draw/DRW_engine.h (+4, -7) (Diff)
/source/blender/draw/engines/clay/clay.c (+32, -93) (Diff)
/source/blender/draw/engines/clay/clay.h (+3, -2) (Diff)
/source/blender/draw/engines/eevee/eevee.c (+6, -4) (Diff)
/source/blender/draw/intern/draw_manager.c (+8, -73) (Diff)
/source/blender/draw/intern/DRW_render.h (+0, -4) (Diff)
/source/blender/draw/modes/edit_mesh_mode.c (+11, -9) (Diff)
/source/blender/draw/modes/object_mode.c (+6, -4) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_ops.c (+108, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+56, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+9, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+1, -47) (Diff)
/source/blender/makesdna/DNA_material_types.h (+0, -30) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -39) (Diff)
/source/blender/makesrna/intern/rna_material.c (+0, -143) (Diff)
/source/blender/makesrna/intern/rna_render.c (+4, -5) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+104, -363) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+9, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+0, -2) (Diff)
/source/blender/render/extern/include/RE_engine.h (+2, -2) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+3, -3) (Diff)