finnish english

Blender Git Commit Log

Git Commits -> Revision aeb8e81

Revision aeb8e81 by Dalai Felinto (master)
February 7, 2017, 10:11 (GMT)
Render Layers and Collections (merge from render-layers)

Design Documents
----------------

* https://wiki.blender.org/index.php/Dev:2.8/Source/Layers

* https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised

User Commit Log
---------------

* New Layer and Collection system to replace render layers and viewport layers.

* A layer is a set of collections of objects (and their drawing options) required for specific tasks.

* A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers.

* All Scenes have a master collection that all other collections are children of.

* New collection "context" tab (in Properties Editor)

* New temporary viewport "collections" panel to control per-collection
visibility

Missing User Features
---------------------

* Collection "Filter"
Option to add objects based on their names

* Collection Manager operators
The existing buttons are placeholders

* Collection Manager drawing
The editor main region is empty

* Collection Override

* Per-Collection engine settings
This will come as a separate commit, as part of the clay-engine branch

Dev Commit Log
--------------

* New DNA file (DNA_layer_types.h) with the new structs
We are replacing Base by a new extended Base while keeping it backward
compatible with some legacy settings (i.e., lay, flag_legacy).

Renamed all Base to BaseLegacy to make it clear the areas of code that
still need to be converted

Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp

* Unittesting for main syncronization requirements
- read, write, add/copy/remove objects, copy scene, collection
link/unlinking, context)

* New Editor: Collection Manager
Based on patch by Julian Eisel
This is extracted from the layer-manager branch. With the following changes:

- Renamed references of layer manager to collections manager

- I doesn't include the editors/space_collections/ draw and util files

- The drawing code itself will be implemented separately by Julian

* Base / Object:
A little note about them. Original Blender code would try to keep them
in sync through the code, juggling flags back and forth. This will now
be handled by Depsgraph, keeping Object and Bases more separated
throughout the non-rendering code.

Scene.base is being cleared in doversion, and the old viewport drawing
code was poorly converted to use the new bases while the new viewport
code doesn't get merged and replace the old one.

Python API Changes
------------------

```
- scene.layers
+ # no longer exists

- scene.objects
+ scene.scene_layers.active.objects

- scene.objects.active
+ scene.render_layers.active.objects.active

- bpy.context.scene.objects.link()
+ bpy.context.scene_collection.objects.link()

- bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None)
+ bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None)

- bpy.context.object.select
+ bpy.context.object.select = True
+ bpy.context.object.select = False
+ bpy.context.object.select_get()
+ bpy.context.object.select_set(action='SELECT')
+ bpy.context.object.select_set(action='DESELECT')

-AddObjectHelper.layers
+ # no longer exists
```

Commit Details:

Full Hash: aeb8e81f2741aabc95d14bce7a83cef45481959c
Parent Commit: 97fa285
Lines Changed: +6294, -2280

14 Added Paths:

/release/scripts/startup/bl_ui/properties_collection.py (+79, -0) (View)
/release/scripts/startup/bl_ui/space_collections.py (+41, -0) (View)
/source/blender/blenkernel/BKE_collection.h (+91, -0) (View)
/source/blender/blenkernel/BKE_layer.h (+189, -0) (View)
/source/blender/blenkernel/intern/collection.c (+455, -0) (View)
/source/blender/blenkernel/intern/layer.c (+684, -0) (View)
/source/blender/blenlib/BLI_iterator.h (+54, -0) (View)
/source/blender/blenloader/intern/versioning_280.c (+181, -0) (View)
/source/blender/editors/space_collections/CMakeLists.txt (+45, -0) (View)
/source/blender/editors/space_collections/collections_intern.h (+35, -0) (View)
/source/blender/editors/space_collections/collections_ops.c (+340, -0) (View)
/source/blender/editors/space_collections/space_collections.c (+182, -0) (View)
/source/blender/makesdna/DNA_layer_types.h (+112, -0) (View)
/tests/python/bl_render_layer.py (+1040, -0) (View)

172 Modified Paths:

/build_files/cmake/macros.cmake (+1, -0) (Diff)
/release/scripts/modules/bpy_extras/object_utils.py (+14, -50) (Diff)
/release/scripts/presets/keyconfig/3dsmax.py (+0, -1) (Diff)
/release/scripts/presets/keyconfig/maya.py (+0, -1) (Diff)
/release/scripts/startup/bl_operators/clip.py (+2, -2) (Diff)
/release/scripts/startup/bl_operators/freestyle.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/object.py (+10, -8) (Diff)
/release/scripts/startup/bl_operators/rigidbody.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/properties_render_layer.py (+2, -99) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+68, -21) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+2, -0) (Diff)
/release/scripts/templates_py/batch_export.py (+3, -3) (Diff)
/release/scripts/templates_py/operator_modal_view3d_raycast.py (+1, -1) (Diff)
/source/blender/alembic/intern/abc_exporter.cc (+3, -3) (Diff)
/source/blender/blenkernel/BKE_context.h (+8, -0) (Diff)
/source/blender/blenkernel/BKE_group.h (+3, -2) (Diff)
/source/blender/blenkernel/BKE_node.h (+7, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+5, -4) (Diff)
/source/blender/blenkernel/BKE_scene.h (+15, -8) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/cachefile.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/camera.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/collision.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/context.c (+68, -2) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/effect.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/group.c (+2, -15) (Diff)
/source/blender/blenkernel/intern/library_query.c (+24, -3) (Diff)
/source/blender/blenkernel/intern/library_remap.c (+43, -20) (Diff)
/source/blender/blenkernel/intern/mball.c (+15, -17) (Diff)
/source/blender/blenkernel/intern/mball_tessellate.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+17, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+18, -22) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+182, -58) (Diff)
/source/blender/blenkernel/intern/smoke.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/softbody.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/sound.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_ghash.h (+1, -0) (Diff)
/source/blender/blenlib/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenloader/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+125, -22) (Diff)
/source/blender/blenloader/intern/readfile.h (+4, -0) (Diff)
/source/blender/blenloader/intern/versioning_250.c (+1, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+39, -2) (Diff)
/source/blender/collada/DocumentImporter.cpp (+3, -2) (Diff)
/source/blender/collada/EffectExporter.cpp (+1, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+2, -2) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.h (+6, -3) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc (+1, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.h (+1, -1) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc (+1, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+4, -4) (Diff)
/source/blender/editors/animation/anim_channels_edit.c (+8, -7) (Diff)
/source/blender/editors/animation/anim_filter.c (+15, -15) (Diff)
/source/blender/editors/animation/anim_markers.c (+1, -1) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/keyframes_edit.c (+1, -1) (Diff)
/source/blender/editors/armature/armature_intern.h (+2, -2) (Diff)
/source/blender/editors/armature/armature_relations.c (+14, -8) (Diff)
/source/blender/editors/armature/armature_select.c (+1, -1) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+1, -1) (Diff)
/source/blender/editors/armature/pose_select.c (+1, -1) (Diff)
/source/blender/editors/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/curve/editcurve.c (+4, -2) (Diff)
/source/blender/editors/curve/editfont.c (+3, -2) (Diff)
/source/blender/editors/gpencil/gpencil_convert.c (+3, -2) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+1, -1) (Diff)
/source/blender/editors/include/BIF_glutil.h (+1, -0) (Diff)
/source/blender/editors/include/ED_armature.h (+3, -2) (Diff)
/source/blender/editors/include/ED_object.h (+15, -7) (Diff)
/source/blender/editors/include/ED_screen.h (+1, -0) (Diff)
/source/blender/editors/include/ED_space_api.h (+1, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+1, -1) (Diff)
/source/blender/editors/include/ED_view3d.h (+3, -3) (Diff)
/source/blender/editors/include/UI_interface.h (+3, -0) (Diff)
/source/blender/editors/include/UI_interface_icons.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_eyedropper.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_icons.c (+8, -0) (Diff)
/source/blender/editors/interface/interface_widgets.c (+4, -1) (Diff)
/source/blender/editors/interface/resources.c (+13, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+16, -14) (Diff)
/source/blender/editors/mesh/meshtools.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_data.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+4, -3) (Diff)
/source/blender/editors/object/object_add.c (+76, -103) (Diff)
/source/blender/editors/object/object_constraint.c (+4, -3) (Diff)
/source/blender/editors/object/object_edit.c (+9, -201) (Diff)
/source/blender/editors/object/object_group.c (+14, -19) (Diff)
/source/blender/editors/object/object_hook.c (+9, -7) (Diff)
/source/blender/editors/object/object_intern.h (+0, -5) (Diff)
/source/blender/editors/object/object_modifier.c (+8, -6) (Diff)
/source/blender/editors/object/object_ops.c (+0, -25) (Diff)
/source/blender/editors/object/object_relations.c (+116, -199) (Diff)
/source/blender/editors/object/object_select.c (+103, -198) (Diff)
/source/blender/editors/object/object_vgroup.c (+1, -1) (Diff)
/source/blender/editors/physics/physics_fluid.c (+2, -2) (Diff)
/source/blender/editors/physics/physics_pointcache.c (+1, -1) (Diff)
/source/blender/editors/physics/rigidbody_constraint.c (+2, -2) (Diff)
/source/blender/editors/physics/rigidbody_object.c (+2, -2) (Diff)
/source/blender/editors/render/render_internal.c (+1, -1) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+7, -5) (Diff)
/source/blender/editors/screen/glutil.c (+12, -0) (Diff)
/source/blender/editors/screen/screen_context.c (+82, -80) (Diff)
/source/blender/editors/screen/screen_ops.c (+4, -0) (Diff)
/source/blender/editors/space_api/spacetypes.c (+1, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+32, -2) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+2, -0) (Diff)
/source/blender/editors/space_clip/tracking_ops_orient.c (+1, -1) (Diff)
/source/blender/editors/space_info/info_stats.c (+8, -8) (Diff)
/source/blender/editors/space_logic/logic_window.c (+2, -2) (Diff)
/source/blender/editors/space_nla/nla_channels.c (+8, -7) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+3, -280) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+19, -186) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+2, -5) (Diff)
/source/blender/editors/space_outliner/outliner_ops.c (+0, -9) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+7, -4) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+39, -55) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+40, -30) (Diff)
/source/blender/editors/space_time/space_time.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+8, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+42, -42) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+16, -100) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+7, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+27, -24) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+5, -4) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+0, -5) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_project.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+45, -27) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+7, -7) (Diff)
/source/blender/editors/transform/transform_conversions.c (+17, -17) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_orientations.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+4, -4) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+2, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+4, -4) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+4, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+16, -13) (Diff)
/source/blender/makesdna/DNA_space_types.h (+19, -3) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -1) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_context.c (+35, -0) (Diff)
/source/blender/makesrna/intern/rna_group.c (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+14, -28) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+69, -4) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+835, -11) (Diff)
/source/blender/makesrna/intern/rna_space.c (+18, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+28, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+5, -0) (Diff)
/source/blender/modifiers/intern/MOD_fluidsim.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna_callback.c (+1, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -1) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+4, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+4, -2) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_Light.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_Light.h (+2, -2) (Diff)
/tests/python/CMakeLists.txt (+7, -0) (Diff)

Navigation

Stats

Page loads : 127 455 429
Users online : -

RSS Feeds
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021