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 ```
210 lines
6.9 KiB
Python
210 lines
6.9 KiB
Python
# ##### BEGIN GPL LICENSE BLOCK #####
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# ##### END GPL LICENSE BLOCK #####
|
|
|
|
# <pep8 compliant>
|
|
|
|
# note, properties_animviz is a helper module only.
|
|
|
|
# support reloading sub-modules
|
|
if "bpy" in locals():
|
|
from importlib import reload
|
|
for val in _modules_loaded:
|
|
reload(val)
|
|
del reload
|
|
|
|
_modules = [
|
|
"properties_animviz",
|
|
"properties_collection",
|
|
"properties_constraint",
|
|
"properties_data_armature",
|
|
"properties_data_bone",
|
|
"properties_data_camera",
|
|
"properties_data_curve",
|
|
"properties_data_empty",
|
|
"properties_data_lamp",
|
|
"properties_data_lattice",
|
|
"properties_data_mesh",
|
|
"properties_data_metaball",
|
|
"properties_data_modifier",
|
|
"properties_data_speaker",
|
|
"properties_game",
|
|
"properties_mask_common",
|
|
"properties_material",
|
|
"properties_object",
|
|
"properties_paint_common",
|
|
"properties_grease_pencil_common",
|
|
"properties_particle",
|
|
"properties_physics_cloth",
|
|
"properties_physics_common",
|
|
"properties_physics_dynamicpaint",
|
|
"properties_physics_field",
|
|
"properties_physics_fluid",
|
|
"properties_physics_rigidbody",
|
|
"properties_physics_rigidbody_constraint",
|
|
"properties_physics_smoke",
|
|
"properties_physics_softbody",
|
|
"properties_render",
|
|
"properties_render_layer",
|
|
"properties_scene",
|
|
"properties_texture",
|
|
"properties_world",
|
|
"space_clip",
|
|
"space_console",
|
|
"space_dopesheet",
|
|
"space_filebrowser",
|
|
"space_graph",
|
|
"space_image",
|
|
"space_info",
|
|
"space_collections",
|
|
"space_logic",
|
|
"space_nla",
|
|
"space_node",
|
|
"space_outliner",
|
|
"space_properties",
|
|
"space_sequencer",
|
|
"space_text",
|
|
"space_time",
|
|
"space_userpref",
|
|
"space_view3d",
|
|
"space_view3d_toolbar",
|
|
]
|
|
|
|
import bpy
|
|
|
|
if bpy.app.build_options.freestyle:
|
|
_modules.append("properties_freestyle")
|
|
|
|
__import__(name=__name__, fromlist=_modules)
|
|
_namespace = globals()
|
|
_modules_loaded = [_namespace[name] for name in _modules]
|
|
del _namespace
|
|
|
|
|
|
def register():
|
|
bpy.utils.register_module(__name__)
|
|
|
|
# space_userprefs.py
|
|
from bpy.props import StringProperty, EnumProperty
|
|
from bpy.types import WindowManager
|
|
|
|
def addon_filter_items(self, context):
|
|
import addon_utils
|
|
|
|
items = [('All', "All", "All Add-ons"),
|
|
('User', "User", "All Add-ons Installed by User"),
|
|
('Enabled', "Enabled", "All Enabled Add-ons"),
|
|
('Disabled', "Disabled", "All Disabled Add-ons"),
|
|
]
|
|
|
|
items_unique = set()
|
|
|
|
for mod in addon_utils.modules(refresh=False):
|
|
info = addon_utils.module_bl_info(mod)
|
|
items_unique.add(info["category"])
|
|
|
|
items.extend([(cat, cat, "") for cat in sorted(items_unique)])
|
|
return items
|
|
|
|
WindowManager.addon_search = StringProperty(
|
|
name="Search",
|
|
description="Search within the selected filter",
|
|
options={'TEXTEDIT_UPDATE'},
|
|
)
|
|
WindowManager.addon_filter = EnumProperty(
|
|
items=addon_filter_items,
|
|
name="Category",
|
|
description="Filter add-ons by category",
|
|
)
|
|
|
|
WindowManager.addon_support = EnumProperty(
|
|
items=[('OFFICIAL', "Official", "Officially supported"),
|
|
('COMMUNITY', "Community", "Maintained by community developers"),
|
|
('TESTING', "Testing", "Newly contributed scripts (excluded from release builds)")
|
|
],
|
|
name="Support",
|
|
description="Display support level",
|
|
default={'OFFICIAL', 'COMMUNITY'},
|
|
options={'ENUM_FLAG'},
|
|
)
|
|
# done...
|
|
|
|
|
|
def unregister():
|
|
bpy.utils.unregister_module(__name__)
|
|
|
|
|
|
# Define a default UIList, when a list does not need any custom drawing...
|
|
# Keep in sync with its #defined name in UI_interface.h
|
|
class UI_UL_list(bpy.types.UIList):
|
|
# These are common filtering or ordering operations (same as the default C ones!).
|
|
@staticmethod
|
|
def filter_items_by_name(pattern, bitflag, items, propname="name", flags=None, reverse=False):
|
|
"""
|
|
Set FILTER_ITEM for items which name matches filter_name one (case-insensitive).
|
|
pattern is the filtering pattern.
|
|
propname is the name of the string property to use for filtering.
|
|
flags must be a list of integers the same length as items, or None!
|
|
return a list of flags (based on given flags if not None),
|
|
or an empty list if no flags were given and no filtering has been done.
|
|
"""
|
|
import fnmatch
|
|
|
|
if not pattern or not items: # Empty pattern or list = no filtering!
|
|
return flags or []
|
|
|
|
if flags is None:
|
|
flags = [0] * len(items)
|
|
|
|
# Implicitly add heading/trailing wildcards.
|
|
pattern = "*" + pattern + "*"
|
|
|
|
for i, item in enumerate(items):
|
|
name = getattr(item, propname, None)
|
|
# This is similar to a logical xor
|
|
if bool(name and fnmatch.fnmatchcase(name, pattern)) is not bool(reverse):
|
|
flags[i] |= bitflag
|
|
return flags
|
|
|
|
@staticmethod
|
|
def sort_items_helper(sort_data, key, reverse=False):
|
|
"""
|
|
Common sorting utility. Returns a neworder list mapping org_idx -> new_idx.
|
|
sort_data must be an (unordered) list of tuples [(org_idx, ...), (org_idx, ...), ...].
|
|
key must be the same kind of callable you would use for sorted() builtin function.
|
|
reverse will reverse the sorting!
|
|
"""
|
|
sort_data.sort(key=key, reverse=reverse)
|
|
neworder = [None] * len(sort_data)
|
|
for newidx, (orgidx, *_) in enumerate(sort_data):
|
|
neworder[orgidx] = newidx
|
|
return neworder
|
|
|
|
@classmethod
|
|
def sort_items_by_name(cls, items, propname="name"):
|
|
"""
|
|
Re-order items using their names (case-insensitive).
|
|
propname is the name of the string property to use for sorting.
|
|
return a list mapping org_idx -> new_idx,
|
|
or an empty list if no sorting has been done.
|
|
"""
|
|
_sort = [(idx, getattr(it, propname, "")) for idx, it in enumerate(items)]
|
|
return cls.sort_items_helper(_sort, lambda e: e[1].lower())
|
|
|
|
|
|
bpy.utils.register_class(UI_UL_list)
|