diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-04-23 02:08:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-23 02:08:19 +0400 |
| commit | 94ad8c810c1699188f4c54a9307af31fc5fd9e7a (patch) | |
| tree | 1383cf6f4649cf29ecc7753f74fe899fd3bf65e1 /source/blender/include/blendef.h | |
| parent | 1c52e2cfa4096f3775472bd11d5ac982edc5ae3a (diff) | |
Changed TESTBASE and TESTBASE_LIB to check the hidden flag
Checked every instance of testbase to see this dosnt break anything, also changed TESTBASE and TESTBASELIB, both were used incorrectly in places.
added error_libdata() for library error messages that are everywhere.
added object_data_is_libdata to test if the object and its data's are from a library.
fixed 2 crashs in adding Curve points to a library object (remember to check, verify_ipocurve returns NULL!)
made duplicating and making dupli's real for lib objects possible, disabled joining into lib armatures and meshes.
Diffstat (limited to 'source/blender/include/blendef.h')
| -rw-r--r-- | source/blender/include/blendef.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index dc0d1998808..4b36aea88a8 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -95,8 +95,8 @@ #define NOT_YET 0 -#define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) -#define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0)) +#define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) ) +#define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0)) #define BASE_SELECTABLE(base) ((base->lay & G.vd->lay) && !(base->object->restrictflag & OB_RESTRICT_SELECT) && !(base->object->restrictflag & OB_RESTRICT_VIEW)) #define FIRSTBASE G.scene->base.first #define LASTBASE G.scene->base.last @@ -441,4 +441,8 @@ #define VP_HARD 64 #define VP_ONLYVGROUP 128 +/* Error messages */ +#define ERROR_LIBDATA_MESSAGE "Can't edit external libdata" + + #endif |