diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f05369a0d58..f6efca10700 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1615,7 +1615,7 @@ typedef struct Scene { struct Scene *set; ListBase base DNA_DEPRECATED; - struct BaseLegacy *basact; /* active base */ + struct Base *basact DNA_DEPRECATED; /* active base */ struct Object *obedit; /* name replaces old G.obedit */ float cursor[3]; /* 3d cursor location */ @@ -1911,12 +1911,7 @@ extern const char *RE_engine_id_CYCLES; #define MINAFRAME -1048574 #define MINAFRAMEF -1048574.0f -/* depricate this! */ -#define TESTBASE(v3d, base) ( \ - ((base)->flag_legacy & SELECT) && \ - ((base)->lay & v3d->lay) && \ - (((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0)) - +/* deprecate this! */ #define TESTBASE_NEW(base) ( \ (((base)->flag & BASE_SELECTED) != 0) && \ (((base)->flag & BASE_VISIBLED) != 0)) @@ -1936,11 +1931,6 @@ extern const char *RE_engine_id_CYCLES; #define BASE_VISIBLE_NEW(base) ( \ ((base)->flag & BASE_VISIBLED) != 0) -#define FIRSTBASE scene->base.first -#define LASTBASE scene->base.last -#define BASACT (scene->basact) -#define OBACT (BASACT ? BASACT->object: NULL) - #define FIRSTBASE_NEW(_sl) ((_sl)->object_bases.first) #define LASTBASE_NEW(_sl) ((_sl)->object_bases.last) #define BASACT_NEW(_sl) ((_sl)->basact) |