[Bf-blender-cvs] [8a3dd31658] render-layers: Rename: BASE_VISIBLE > BASE_VISIBLED

[Dalai Felinto]

Commit: 8a3dd316588da25ca236ec9b0fc9b9e4a2907a3f
Author: Dalai Felinto
Date:   Mon Jan 16 13:16:00 2017 +0100
Branches: render-layers
https://developer.blender.org/rB8a3dd316588da25ca236ec9b0fc9b9e4a2907a3f

Rename: BASE_VISIBLE > BASE_VISIBLED

BASE_VISIBLE was already defined on DNA_scene_types.h

===================================================================

M	source/blender/blenkernel/intern/layer.c
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/makesdna/DNA_layer_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 81facb75d7..7b0ebf38a7 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -207,7 +207,7 @@ static void layer_collection_base_flag_recalculate(LayerCollection *lc, bool *is
 		ObjectBase *base = link->data;
 
 		if (!*is_visible) {
-			base->flag &= ~BASE_VISIBLE;
+			base->flag &= ~BASE_VISIBLED;
 		}
 
 		if (!*is_selectable) {
@@ -227,7 +227,7 @@ void BKE_scene_layer_base_flag_recalculate(SceneLayer *sl)
 {
 	/* tranverse the entire tree and update ObjectBase flags */
 	for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
-		base->flag |= BASE_VISIBLE;
+		base->flag |= BASE_VISIBLED;
 	}
 
 	for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
@@ -588,7 +588,7 @@ void BKE_visible_objects_Iterator_begin(Iterator *iter, void *data_in)
 	iter->valid = true;
 	iter->data = base;
 
-	if ((base->flag & BASE_VISIBLE) == 0) {
+	if ((base->flag & BASE_VISIBLED) == 0) {
 		BKE_selected_objects_Iterator_next(iter);
 	}
 	else {
@@ -601,7 +601,7 @@ void BKE_visible_objects_Iterator_next(Iterator *iter)
 	ObjectBase *base = ((ObjectBase *)iter->data)->next;
 
 	while (base) {
-		if ((base->flag & BASE_VISIBLE) != 0) {
+		if ((base->flag & BASE_VISIBLED) != 0) {
 			iter->current = base->object;
 			iter->data = base;
 			return;
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index b0d7c85c04..09dab1508b 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -368,7 +368,7 @@ static void object_select_cb(
 	Object *ob = (Object *)tselem->id;
 	ObjectBase *base = BKE_scene_layer_base_find(sl, ob);
 
-	if (base && ((base->flag & BASE_VISIBLE) != 0)) {
+	if (base && ((base->flag & BASE_VISIBLED) != 0)) {
 		base->flag |= BASE_SELECTED;
 	}
 }
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 31230cf61d..40750d7ba4 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -80,7 +80,7 @@ typedef struct SceneCollection {
 /* ObjectBase->flag */
 enum {
 	BASE_SELECTED         = (1 << 0),
-	BASE_VISIBLE          = (1 << 1),
+	BASE_VISIBLED         = (1 << 1),
 };
 
 /* LayerCollection->flag */