[Bf-blender-cvs] [be493d60b5d] experimental-build: Build test for outliner-visibility patch
Dalai Felinto
noreply at git.blender.org
Tue Dec 11 19:43:32 CET 2018
Commit: be493d60b5d6f919e714ce42ec8d2ad1cfec7e21
Author: Dalai Felinto
Date: Tue Dec 11 16:43:15 2018 -0200
Branches: experimental-build
https://developer.blender.org/rBbe493d60b5d6f919e714ce42ec8d2ad1cfec7e21
Build test for outliner-visibility patch
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M source/blender/editors/object/object_edit.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesrna/intern/rna_layer.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 4fc247cc8f5..a7fe780d1dd 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4110,11 +4110,8 @@ class VIEW3D_PT_collections(Panel):
sub = row.split()
subrow = sub.row(align=True)
subrow.alignment = 'RIGHT'
- icon = 'HIDE_OFF' if has_visible_objects else 'HIDE_ON'
- props = subrow.operator("object.hide_collection", text="", icon=icon, emboss=False)
- props.collection_index = index
- props.toggle = True
- subrow.prop(child.collection, "hide_select", text="", emboss=False)
+ subrow.active = collection.is_visible # Parent collection runtime visibility
+ subrow.prop(child, "hide_viewport", text="", emboss=False)
for child in collection.children:
index = self._draw_collection(layout, view_layer, child, index)
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index db363148bc8..61d2b03a893 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -113,6 +113,8 @@ bool BKE_layer_collection_objects_select(
struct ViewLayer *view_layer, struct LayerCollection *lc, bool deselect);
bool BKE_layer_collection_has_selected_objects(
struct ViewLayer *view_layer, struct LayerCollection *lc);
+bool BKE_layer_collection_has_layer_collection(
+ struct LayerCollection *lc_parent, struct LayerCollection *lc_child);
void BKE_base_set_visible(struct Scene *scene, struct ViewLayer *view_layer, struct Base *base, bool extend);
void BKE_layer_collection_set_visible(struct Scene *scene, struct ViewLayer *view_layer, struct LayerCollection *lc, bool extend);
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index bee915567bd..6b0bdd3c740 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -611,7 +611,7 @@ int BKE_layer_collection_findindex(ViewLayer *view_layer, const LayerCollection
static short layer_collection_sync(
ViewLayer *view_layer, const ListBase *lb_scene,
ListBase *lb_layer, ListBase *new_object_bases,
- short parent_exclude, short parent_restrict)
+ short parent_exclude, short parent_restrict, short parent_layer_restrict)
{
/* TODO: support recovery after removal of intermediate collections, reordering, ..
* For local edits we can make editing operating do the appropriate thing, but for
@@ -656,15 +656,17 @@ static short layer_collection_sync(
/* Collection restrict is inherited. */
short child_restrict = parent_restrict;
+ short child_layer_restrict = parent_layer_restrict;
if (!(collection->flag & COLLECTION_IS_MASTER)) {
child_restrict |= collection->flag;
+ child_layer_restrict |= lc->flag;
}
/* Sync child collections. */
short child_runtime_flag = layer_collection_sync(
view_layer, &collection->children,
&lc->layer_collections, new_object_bases,
- lc->flag, child_restrict);
+ lc->flag, child_restrict, child_layer_restrict);
/* Layer collection exclude is not inherited. */
if (lc->flag & LAYER_COLLECTION_EXCLUDE) {
@@ -675,6 +677,12 @@ static short layer_collection_sync(
lc->runtime_flag = child_runtime_flag;
}
+ if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) &&
+ ((child_layer_restrict & LAYER_COLLECTION_RESTRICT_VIEW) == 0))
+ {
+ lc->runtime_flag |= LAYER_COLLECTION_VISIBLE;
+ }
+
/* Sync objects, except if collection was excluded. */
for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
if (cob->ob == NULL) {
@@ -703,6 +711,7 @@ static short layer_collection_sync(
int object_restrict = base->object->restrictflag;
if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) &&
+ ((child_layer_restrict & LAYER_COLLECTION_RESTRICT_VIEW) == 0) &&
((object_restrict & OB_RESTRICT_VIEW) == 0))
{
base->flag |= BASE_VISIBLE | BASE_ENABLED | BASE_ENABLED_VIEWPORT;
@@ -716,7 +725,6 @@ static short layer_collection_sync(
if (((child_restrict & COLLECTION_RESTRICT_RENDER) == 0) &&
((object_restrict & OB_RESTRICT_RENDER) == 0))
-
{
base->flag |= BASE_ENABLED_RENDER;
}
@@ -793,11 +801,11 @@ void BKE_layer_collection_sync(const Scene *scene, ViewLayer *view_layer)
const ListBase collections = {&child, &child};
ListBase new_object_bases = {NULL, NULL};
- const short parent_exclude = 0, parent_restrict = 0;
+ const short parent_exclude = 0, parent_restrict = 0, parent_layer_restrict = 0;
layer_collection_sync(
view_layer, &collections,
&view_layer->layer_collections, &new_object_bases,
- parent_exclude, parent_restrict);
+ parent_exclude, parent_restrict, parent_layer_restrict);
/* Any remaning object bases are to be removed. */
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
@@ -921,7 +929,7 @@ bool BKE_layer_collection_has_selected_objects(ViewLayer *view_layer, LayerColle
for (CollectionObject *cob = lc->collection->gobject.first; cob; cob = cob->next) {
Base *base = BKE_view_layer_base_find(view_layer, cob->ob);
- if (base && (base->flag & BASE_SELECTED)) {
+ if (base && (base->flag & BASE_SELECTED) && (base->flag & BASE_VISIBLE)) {
return true;
}
}
@@ -936,6 +944,20 @@ bool BKE_layer_collection_has_selected_objects(ViewLayer *view_layer, LayerColle
return false;
}
+bool BKE_layer_collection_has_layer_collection(LayerCollection *lc_parent, LayerCollection *lc_child)
+{
+ if (lc_parent == lc_child) {
+ return true;
+ }
+
+ for (LayerCollection *lc_iter = lc_parent->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ if (BKE_layer_collection_has_layer_collection(lc_iter, lc_child)) {
+ return true;
+ }
+ }
+ return false;
+}
+
/* ---------------------------------------------------------------------- */
/* Update after toggling visibility of an object base. */
@@ -957,44 +979,62 @@ void BKE_base_set_visible(Scene *scene, ViewLayer *view_layer, Base *base, bool
BKE_layer_collection_sync(scene, view_layer);
}
+static void layer_collection_flag_set_recursive(LayerCollection *lc, const int flag)
+{
+ lc->flag |= flag;
+ for (LayerCollection *lc_iter = lc->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ layer_collection_flag_set_recursive(lc_iter, flag);
+ }
+}
+
+static void layer_collection_flag_unset_recursive(LayerCollection *lc, const int flag)
+{
+ lc->flag &= ~flag;
+ for (LayerCollection *lc_iter = lc->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ layer_collection_flag_unset_recursive(lc_iter, flag);
+ }
+}
+
+/**
+ * Set collection per-view layer visiblity.
+ * When not extending, we show all the direct parents and all children of the layer collection.
+ */
void BKE_layer_collection_set_visible(Scene *scene, ViewLayer *view_layer, LayerCollection *lc, bool extend)
{
if (!extend) {
- /* Make only objects from one collection visible. */
- for (Base *base = view_layer->object_bases.first; base; base = base->next) {
- base->flag |= BASE_HIDDEN;
+ /* Make only this collection visible. */
+ for (LayerCollection *lc_iter = view_layer->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ layer_collection_flag_set_recursive(lc_iter, LAYER_COLLECTION_RESTRICT_VIEW);
}
- FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(lc->collection, ob)
- {
- Base *base = BLI_ghash_lookup(view_layer->object_bases_hash, ob);
-
- if (base) {
- base->flag &= ~BASE_HIDDEN;
+ /* Make all the direct parents visible. */
+ LayerCollection *lc_parent = lc;
+ LayerCollection *lc_master = view_layer->layer_collections.first;
+ for (LayerCollection *lc_iter = lc_master->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ if (BKE_layer_collection_has_layer_collection(lc_iter, lc)) {
+ lc_parent = lc_iter;
+ break;
}
}
- FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
- BKE_layer_collection_activate(view_layer, lc);
- }
- else {
- /* Toggle visibility of objects from collection. */
- bool hide = (lc->runtime_flag & LAYER_COLLECTION_HAS_VISIBLE_OBJECTS) != 0;
-
- FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(lc->collection, ob)
- {
- Base *base = BLI_ghash_lookup(view_layer->object_bases_hash, ob);
+ while (lc_parent != lc) {
+ lc_parent->flag &= ~LAYER_COLLECTION_RESTRICT_VIEW;
- if (base) {
- if (hide) {
- base->flag |= BASE_HIDDEN;
- }
- else {
- base->flag &= ~BASE_HIDDEN;
+ for (LayerCollection *lc_iter = lc_parent->layer_collections.first; lc_iter; lc_iter = lc_iter->next) {
+ if (BKE_layer_collection_has_layer_collection(lc_iter, lc)) {
+ lc_parent = lc_iter;
+ break;
}
}
}
- FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
+
+ /* Make all the children visible. */
+ layer_collection_flag_unset_recursive(lc, LAYER_COLLECTION_RESTRICT_VIEW);
+
+ BKE_layer_collection_activate(view_layer, lc);
+ }
+ else {
+ lc->flag ^= LAYER_COLLECTION_RESTRICT_VIEW;
}
BKE_layer_collection_sync(scene, view_layer);
@@ -1103,7 +1143,7 @@ typedef struct LayerObjectBaseIteratorData {
Base *base;
} LayerObjectBaseIteratorData;
-static bool object_bases_iterator_is_valid_ex(View3D *v3d, Base *base, const int flag)
+static bool object_bases_iterator_is_valid_ex(View3D *v3d, Base *base, const int flags)
{
if (v3d != NULL) {
BLI_assert(v3d->spacetype == SPACE_VIEW3D);
@@ -1115,12 +1155,12 @@ static bool object_bases_iterator_is_valid_ex(View3D *v3d, Base *base, const int
return false;
}
}
-
- if ((base->flag & flag) == 0) {
- return false;
+ /* Any flag satisfies the condition. */
+ if (flags == ~0) {
+ return (base->flag != 0);
}
-
- return true;
+ /* flags may be more than one flag, so we can't check != 0. */
+ return ((base->flag & flags) == flags);
}
static bool object_bases_iterator_is_valid(View3D *v3d, Base *base)
@@ -1208,12 +1248,12 @@ static void objects_iterator_end(BLI_I
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list