[Bf-blender-cvs] [4661caf] temp_localview_split: Adjust local view checks in base macros

[Julian Eisel]

Commit: 4661cafc2b6d2bde802fdba21b5241e6cadf009d
Author: Julian Eisel
Date:   Sat Aug 6 05:02:06 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rB4661cafc2b6d2bde802fdba21b5241e6cadf009d

Adjust local view checks in base macros

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

M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index d50b6ce..b84e5d8 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1821,39 +1821,37 @@ extern const char *RE_engine_id_CYCLES;
 /* depricate this! */
 #define TESTBASE(v3d, base)  (                                                \
 	((base)->flag & SELECT) &&                                                \
-	(v3d->localviewd ? BKE_localview_is_object_visible(v3d, base->object) : ((base)->lay & v3d->lay)) && \
+	((base)->lay & v3d->lay) &&                                               \
+	(BKE_localview_is_object_visible(v3d, base->object)) &&                   \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
 #define TESTBASELIB(v3d, base)  (                                             \
 	((base)->flag & SELECT) &&                                                \
-	(v3d->localviewd ? BKE_localview_is_object_visible(v3d, base->object) : ((base)->lay & v3d->lay)) && \
+	((base)->lay & v3d->lay) &&                                               \
+	(BKE_localview_is_object_visible(v3d, base->object)) &&                   \
 	((base)->object->id.lib == NULL) &&                                       \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
 #define TESTBASELIB_BGMODE(v3d, scene, base)  (                               \
 	((base)->flag & SELECT) &&                                                \
-	((v3d && v3d->localviewd) ?                                               \
-	    BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview) : \
-	    (v3d ? v3d->lay : scene->lay)) &&                                     \
 	((base)->lay & (v3d ? v3d->lay : scene->lay)) &&                          \
+	(!v3d || !v3d->localviewd || BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview)) && \
 	((base)->object->id.lib == NULL) &&                                       \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
 #define BASE_EDITABLE_BGMODE(v3d, scene, base)  (                             \
 	((base)->lay & (v3d ? v3d->lay : scene->lay)) &&                          \
-	((v3d && v3d->localviewd) ?                                               \
-	    BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview) : \
-	    (v3d ? v3d->lay : scene->lay)) &&                                     \
+	(!v3d || !v3d->localviewd || BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview)) && \
 	((base)->object->id.lib == NULL) &&                                       \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
 #define BASE_SELECTABLE(v3d, base)  (                                         \
-	(v3d->localviewd ? BKE_localview_is_object_visible(v3d, base->object) : ((base)->lay & v3d->lay)) && \
+	((base)->lay & v3d->lay) &&                                               \
+	(BKE_localview_is_object_visible(v3d, base->object)) &&                   \
 	(base->object->restrictflag & (OB_RESTRICT_SELECT | OB_RESTRICT_VIEW)) == 0)
 #define BASE_VISIBLE(v3d, base)  (                                            \
-	(v3d->localviewd ? BKE_localview_is_object_visible(v3d, base->object) : ((base)->lay & v3d->lay)) && \
+	((base)->lay & v3d->lay) &&                                               \
+	(BKE_localview_is_object_visible(v3d, base->object)) &&                   \
 	(base->object->restrictflag & OB_RESTRICT_VIEW) == 0)
 #define BASE_VISIBLE_BGMODE(v3d, scene, base)  (                              \
 	(base->lay & (v3d ? v3d->lay : scene->lay)) &&                            \
-	((v3d && v3d->localviewd) ?                                               \
-	    BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview) : \
-	    (v3d ? v3d->lay : scene->lay)) &&                                     \
+	(!v3d || !v3d->localviewd || BKE_localview_info_cmp(v3d->localviewd->info, base->object->localview)) && \
 	(base->object->restrictflag & OB_RESTRICT_VIEW) == 0)
 
 #define FIRSTBASE		scene->base.first