[Bf-blender-cvs] [e922e42fe64] blender2.8: Remove BASE_VISIBLE, BASE_SELECTABLE, TESTBASELIB (no longer used)

Dalai Felinto noreply at git.blender.org
Wed Mar 29 22:37:42 CEST 2017


Commit: e922e42fe64ae42b8f442a0be0a40212d3369a67
Author: Dalai Felinto
Date:   Wed Mar 29 21:13:16 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBe922e42fe64ae42b8f442a0be0a40212d3369a67

Remove BASE_VISIBLE, BASE_SELECTABLE, TESTBASELIB (no longer used)

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

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 661e6f7d98a..eac599eefc4 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1967,11 +1967,6 @@ extern const char *RE_engine_id_CYCLES;
 	((base)->flag_legacy & SELECT) &&                                         \
 	((base)->lay & v3d->lay) &&                                               \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
-#define TESTBASELIB(v3d, base)  (                                             \
-	((base)->flag_legacy & SELECT) &&                                         \
-	((base)->lay & v3d->lay) &&                                               \
-	((base)->object->id.lib == NULL) &&                                       \
-	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
 #define TESTBASELIB_BGMODE(v3d, scene, base)  (                               \
 	((base)->flag_legacy & SELECT) &&                                         \
 	((base)->lay & (v3d ? v3d->lay : scene->lay)) &&                          \
@@ -1981,12 +1976,6 @@ extern const char *RE_engine_id_CYCLES;
 	((base)->lay & (v3d ? v3d->lay : scene->lay)) &&                          \
 	((base)->object->id.lib == NULL) &&                                       \
 	(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
-#define BASE_SELECTABLE(v3d, base)  (                                         \
-	(v3d != NULL) &&                                                          \
-	((base)->object->restrictflag & (OB_RESTRICT_SELECT | OB_RESTRICT_VIEW)) == 0)
-#define BASE_VISIBLE(v3d, base)  (                                            \
-	((base)->lay & v3d->lay) &&                                               \
-	((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0)
 #define BASE_VISIBLE_BGMODE(v3d, scene, base)  (                              \
 	((base)->lay & (v3d ? v3d->lay : scene->lay)) &&                          \
 	((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0)




More information about the Bf-blender-cvs mailing list