[Bf-blender-cvs] [17bd5c9d4b1] blender2.8: Collections and groups unification
Brecht Van Lommel
noreply at git.blender.org
Fri May 18 13:35:00 CEST 2018
Commit: 17bd5c9d4b1e9377b896c13043e24eaa7e979714
Author: Brecht Van Lommel
Date: Mon Apr 30 15:57:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB17bd5c9d4b1e9377b896c13043e24eaa7e979714
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
===================================================================
M doc/python_api/examples/bpy.ops.2.py
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
M release/scripts/modules/bpy_types.py
M release/scripts/startup/bl_operators/file.py
M release/scripts/startup/bl_ui/__init__.py
D release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_collection.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_effect.h
M source/blender/blenkernel/BKE_freestyle.h
D source/blender/blenkernel/BKE_group.h
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/blender_copybuffer.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/freestyle.c
D source/blender/blenkernel/intern/group.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/idcode.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/library_remap.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/blentranslation/BLT_translation.h
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/depsgraph/DEG_depsgraph.h
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph_build.cc
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/gpencil/gpencil_convert.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_group.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/rigidbody_constraint.c
M source/blender/editors/physics/rigidbody_object.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_nla/space_nla.c
M source/blender/editors/space_outliner/outliner_collections.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_outliner/outliner_utils.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/gpu/intern/gpu_material.c
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_effect_types.h
M source/blender/makesdna/DNA_freestyle_types.h
M source/blender/makesdna/DNA_group_types.h
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_lightprobe_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_outliner_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_smoke_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_group.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_smoke.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/python/intern/bpy_library_load.c
M source/blender/render/intern/source/pipeline.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_operators.c
M tests/python/CMakeLists.txt
===================================================================
diff --git a/doc/python_api/examples/bpy.ops.2.py b/doc/python_api/examples/bpy.ops.2.py
index dd88c73d5e9..5f98c8a6656 100644
--- a/doc/python_api/examples/bpy.ops.2.py
+++ b/doc/python_api/examples/bpy.ops.2.py
@@ -20,6 +20,6 @@ The execution context is one of:
'EXEC_SCREEN')
"""
-# group add popup
+# collection add popup
import bpy
-bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
+bpy.ops.object.collection_instance_add('INVOKE_DEFAULT')
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index 32266e972bb..fb3a18c6bea 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -68,7 +68,7 @@ def rna_backup_restore(data, backup):
setattr(dt, path[-1], val)
-def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
+def do_previews(do_objects, do_collections, do_scenes, do_data_intern):
import collections
# Helpers.
@@ -251,9 +251,9 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
return 'BLENDER_RENDER'
def object_bbox_merge(bbox, ob, ob_space, offset_matrix):
- # Take group instances into account (including linked one in this case).
- if ob.type == 'EMPTY' and ob.dupli_type == 'GROUP':
- grp_objects = tuple((ob.name, ob.library.filepath if ob.library else None) for ob in ob.dupli_group.objects)
+ # Take collections instances into account (including linked one in this case).
+ if ob.type == 'EMPTY' and ob.dupli_type == 'COLLECTION':
+ grp_objects = tuple((ob.name, ob.library.filepath if ob.library else None) for ob in ob.dupli_group.all_objects)
if (len(grp_objects) == 0):
ob_bbox = ob.bound_box
else:
@@ -343,7 +343,7 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
render_contexts = {}
objects_ignored = set()
- groups_ignored = set()
+ collections_ignored = set()
prev_scenename = bpy.context.screen.scene.name
@@ -398,11 +398,11 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
if is_rendered is not ...:
ob.hide_render = is_rendered
- if do_groups:
- for grp in ids_nolib(bpy.data.groups):
- if grp.name in groups_ignored:
+ if do_collections:
+ for grp in ids_nolib(bpy.data.collections):
+ if grp.name in collections_ignored:
continue
- # Here too, we do want to keep linked objects members of local group...
+ # Here too, we do want to keep linked objects members of local collection...
objects = tuple((ob.name, ob.library.filepath if ob.library else None) for ob in grp.objects)
render_engine = objects_render_engine_guess(objects)
@@ -414,14 +414,14 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
scene = bpy.data.scenes[render_context.scene, None]
bpy.context.screen.scene = scene
- bpy.ops.object.group_instance_add(group=grp.name)
+ bpy.ops.object.collection_instance_add(collection=grp.name)
grp_ob = next((ob for ob in scene.objects if ob.dupli_group and ob.dupli_group.name == grp.name))
grp_obname = grp_ob.name
scene.update()
offset_matrix = Matrix.Translation(grp.dupli_offset).inverted()
- preview_render_do(render_context, 'groups', grp.name, objects, offset_matrix)
+ preview_render_do(render_context, 'collections', grp.name, objects, offset_matrix)
scene = bpy.data.scenes[render_context.scene, None]
scene.objects.unlink(bpy.data.objects[grp_obname, None])
@@ -462,7 +462,7 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
print("*NOT* Saving %s, because some error(s) happened while deleting temp render data..." % bpy.data.filepath)
-def do_clear_previews(do_objects, do_groups, do_scenes, do_data_intern):
+def do_clear_previews(do_objects, do_collections, do_scenes, do_data_intern):
if do_data_intern:
bpy.ops.wm.previews_clear(id_type=INTERN_PREVIEW_TYPES)
@@ -470,8 +470,8 @@ def do_clear_previews(do_objects, do_groups, do_scenes, do_data_intern):
for ob in ids_nolib(bpy.data.objects):
ob.preview.image_size = (0, 0)
- if do_groups:
- for grp in ids_nolib(bpy.data.groups):
+ if do_collections:
+ for grp in ids_nolib(bpy.data.collections):
grp.preview.image_size = (0, 0)
if do_scenes:
@@ -502,8 +502,8 @@ def main():
help="Do not generate a backup .blend1 file when saving processed ones.")
parser.add_argument('--no_scenes', default=True, action="store_false",
help="Do not generate/clear previews for scene IDs.")
- parser.add_argument('--no_groups', default=True, action="store_false",
- help="Do not generate/clear previews for group IDs.")
+ parser.add_argument('--no_collections', default=True, action="store_false",
+ help="Do not generate/clear previews for collection IDs.")
parser.add_argument('--no_objects', default=True, action="store_false",
help="Do not generate/clear previews for object IDs.")
parser.add_argument('--no_data_intern', default=True, action="store_false",
@@ -518,11 +518,11 @@ def main():
if args.clear:
print("clear!")
- do_clear_previews(do_objects=args.no_objects, do_groups=args.no_groups, do_scenes=args.no_scenes,
+ do_clear_previews(do_objects=args.no_objects, do_collections=args.no_collections, do_scenes=args.no_scenes,
do_data_intern=args.no_data_intern)
else:
print("render!")
- do_previews(do_objects=args.no_objects, do_groups=args.no_groups, do_scenes=args.no_scenes,
+ do_previews(do_objects=args.no_objects, do_collections=args.no_collections, do_scenes=args.no_scenes,
do_data_intern=args.no_data_intern)
# Not really necessary, but better be consistent.
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 324bb43d890..fd6f8e23727 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -60,7 +60,7 @@ class Library(bpy_types.ID):
# See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE,
# we could make this an attribute in rna.
attr_links = ("actions", "armatures", "brushes", "cameras",
- "curves", "grease_pencil", "groups", "images",
+ "curves", "grease_pencil", "collections", "images",
"lamps", "lattices", "materials", "metaballs",
"meshes", "node_groups", "objects", "scenes",
"sounds", "speakers", "textures", "texts",
@@ -96,12 +96,12 @@ class Texture(bpy_types.ID):
)
-class Group(bpy_types.ID):
+class Collection(bpy_types.ID):
__slots__ = ()
@property
def users_dupli_group(self):
- """The dupli group this group is used in"""
+ """The collection instance objects this collection is used in"""
import bpy
return tuple(obj for obj in bpy.data.objects
if self == obj.dupli_group)
@@ -118,11 +118,11 @@ class Object(bpy_types.ID):
if child.parent == self)
@property
- def users_group(self):
- """The groups this object is in"""
+ def users_collection(self):
+ """The collections this object is in"""
import bpy
- return tuple(group for group in bpy.data.groups
- if self in group.objects[:])
+ return tuple(collection for collection in bpy.data.collections
+ if self in collection.objects[:])
@property
def users_scene(self):
diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py
index 4ab8d59f263..8d947d19a82 100644
--- a/release/scripts/startup/bl_operators/file.py
+++ b/release/scripts/startup/bl_operators/file.py
@@ -65,10 +65,10 @@ class WM_OT_previews_batch_generate(Operator):
name="Scenes",
description="Generate scenes' previews",
)
- use_groups = BoolProperty(
+ use_collections = BoolProperty(
default=True,
- name="Groups",
- description="Generate groups' previews",
+ name="Collections",
+ description="Generate collections' previews",
)
use_objects = BoolProperty(
default=True,
@@ -121,8 +121,8 @@ class WM_OT_previews_batch_generate(Operator):
])
if not self.use_scenes:
cmd.append('--no_scenes')
- if not self.use_groups:
- cmd.append('--no_groups')
+ if not self.use_collections:
+ cmd.append('--no_collections')
if not self.use_objects:
cmd.append('--no_objects')
if not self.use_intern_data:
@@ -175,9 +175,9 @@ class WM_OT_previews_batch_clear(Operator):
name="Scenes",
description="Clear scenes' previews",
)
- use_groups = BoolProperty(default=True,
- name="Groups",
- description="Clear groups' previews",
+ use_collections = BoolProperty(default=True,
+ name="Collections",
+ description="Clear collections' previews",
)
use_objects = BoolProperty(
default=True,
@@ -231,8 +231,8 @@ class WM_OT_previews_batch_clear(Operator):
])
if not self.use_scenes:
cmd.append('--no_scenes')
- if not self.use_groups:
- cmd.append('--no_groups')
+ if not self.use_collections:
+ cmd.append('--no_collections')
if not self.use_objects:
cmd.append('--no_objects')
if not se
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list