Blender Git Loki
Git Commits -> Revision be9e469
Revision be9e469 by Dalai Felinto (master) December 1, 2017, 16:15 (GMT) |
Groups and collection: initial integration Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892 |
Commit Details:
Full Hash: be9e469ead227aee8d4c29b98a125cf599c5c8bb
Parent Commit: e8c15e0
Lines Changed: +1373, -944
58 Modified Paths:
/release/scripts/startup/bl_ui/properties_object.py (+2, -7) (Diff)
/source/blender/alembic/intern/alembic_capi.cc (+2, -2) (Diff)
/source/blender/blenkernel/BKE_collection.h (+18, -13) (Diff)
/source/blender/blenkernel/BKE_group.h (+21, -0) (Diff)
/source/blender/blenkernel/BKE_layer.h (+17, -11) (Diff)
/source/blender/blenkernel/intern/collection.c (+148, -58) (Diff)
/source/blender/blenkernel/intern/collision.c (+22, -13) (Diff)
/source/blender/blenkernel/intern/context.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+9, -27) (Diff)
/source/blender/blenkernel/intern/effect.c (+20, -29) (Diff)
/source/blender/blenkernel/intern/group.c (+80, -62) (Diff)
/source/blender/blenkernel/intern/layer.c (+215, -49) (Diff)
/source/blender/blenkernel/intern/library_query.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/library_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+70, -53) (Diff)
/source/blender/blenkernel/intern/particle.c (+11, -12) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+74, -74) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -126) (Diff)
/source/blender/blenkernel/intern/softbody.c (+26, -50) (Diff)
/source/blender/blenloader/intern/readfile.c (+103, -56) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+47, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+33, -27) (Diff)
/source/blender/collada/collada_utils.cpp (+1, -1) (Diff)
/source/blender/collada/DocumentImporter.cpp (+1, -1) (Diff)
/source/blender/collada/SceneExporter.cpp (+7, -5) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+6, -4) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.h (+5, -3) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc (+10, -8) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc (+1, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+15, -9) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.h (+5, -3) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc (+9, -6) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc (+1, -1) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+4, -3) (Diff)
/source/blender/editors/gpencil/gpencil_convert.c (+1, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_relations.c (+19, -17) (Diff)
/source/blender/editors/space_info/info_stats.c (+38, -11) (Diff)
/source/blender/editors/space_outliner/outliner_collections.c (+19, -10) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+27, -13) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+4, -4) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+2, -3) (Diff)
/source/blender/editors/space_outliner/outliner_ops.c (+8, -9) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+18, -10) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+54, -18) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+49, -37) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+5, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+2, -2) (Diff)
/source/blender/makesdna/DNA_group_types.h (+7, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+7, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_group.c (+8, -10) (Diff)
/source/blender/makesrna/intern/rna_layer.c (+55, -33) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+37, -30) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -3) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+5, -5) (Diff)
/source/blender/alembic/intern/alembic_capi.cc (+2, -2) (Diff)
/source/blender/blenkernel/BKE_collection.h (+18, -13) (Diff)
/source/blender/blenkernel/BKE_group.h (+21, -0) (Diff)
/source/blender/blenkernel/BKE_layer.h (+17, -11) (Diff)
/source/blender/blenkernel/intern/collection.c (+148, -58) (Diff)
/source/blender/blenkernel/intern/collision.c (+22, -13) (Diff)
/source/blender/blenkernel/intern/context.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+9, -27) (Diff)
/source/blender/blenkernel/intern/effect.c (+20, -29) (Diff)
/source/blender/blenkernel/intern/group.c (+80, -62) (Diff)
/source/blender/blenkernel/intern/layer.c (+215, -49) (Diff)
/source/blender/blenkernel/intern/library_query.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/library_remap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+70, -53) (Diff)
/source/blender/blenkernel/intern/particle.c (+11, -12) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+74, -74) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -126) (Diff)
/source/blender/blenkernel/intern/softbody.c (+26, -50) (Diff)
/source/blender/blenloader/intern/readfile.c (+103, -56) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+47, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+33, -27) (Diff)
/source/blender/collada/collada_utils.cpp (+1, -1) (Diff)
/source/blender/collada/DocumentImporter.cpp (+1, -1) (Diff)
/source/blender/collada/SceneExporter.cpp (+7, -5) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+6, -4) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.h (+5, -3) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc (+10, -8) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc (+1, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+15, -9) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.h (+5, -3) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc (+9, -6) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc (+1, -1) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+4, -3) (Diff)
/source/blender/editors/gpencil/gpencil_convert.c (+1, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_relations.c (+19, -17) (Diff)
/source/blender/editors/space_info/info_stats.c (+38, -11) (Diff)
/source/blender/editors/space_outliner/outliner_collections.c (+19, -10) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+27, -13) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+4, -4) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+2, -3) (Diff)
/source/blender/editors/space_outliner/outliner_ops.c (+8, -9) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+18, -10) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+54, -18) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+49, -37) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+5, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+2, -2) (Diff)
/source/blender/makesdna/DNA_group_types.h (+7, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+7, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_group.c (+8, -10) (Diff)
/source/blender/makesrna/intern/rna_layer.c (+55, -33) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+37, -30) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -3) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+5, -5) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021