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/src/headerbuttons.c | |
| 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/src/headerbuttons.c')
| -rw-r--r-- | source/blender/src/headerbuttons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index dd1a99d9f2b..83297907992 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -268,14 +268,14 @@ int std_libbuttons(uiBlock *block, short xco, short yco, if ELEM8( id_code, ID_SCE, ID_SCR, ID_MA, ID_TE, ID_WO, ID_IP, ID_AC, ID_BR) extrastr= "ADD NEW %x 32767"; else if (id_code==ID_TXT) extrastr= "OPEN NEW %x 32766 |ADD NEW %x 32767"; else if (id_code==ID_SO) extrastr= "OPEN NEW %x 32766"; - - uiSetButLock(G.scene->id.lib!=0, "Can't edit library data"); + + uiSetButLock(G.scene->id.lib!=0, ERROR_LIBDATA_MESSAGE); if( id_code==ID_SCE || id_code==ID_SCR ) uiClearButLock(); if(curarea->spacetype==SPACE_BUTS) uiSetButLock(id_code!=ID_SCR && G.obedit!=0 && G.buts->mainb==CONTEXT_EDITING, "Cannot perform in EditMode"); - if(parid) uiSetButLock(parid->lib!=0, "Can't edit library data"); + if(parid) uiSetButLock(parid->lib!=0, ERROR_LIBDATA_MESSAGE); if (lb) { if( id_code==ID_IP) @@ -307,7 +307,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco, /* Redalert overrides pin color */ if(id->us<=0) uiBlockSetCol(block, TH_REDALERT); - uiSetButLock(id->lib!=0, "Can't edit library data"); + uiSetButLock(id->lib!=0, ERROR_LIBDATA_MESSAGE); if(GS(id->name)==ID_SCE) strcpy(str1, "SCE:"); else if(GS(id->name)==ID_SCE) strcpy(str1, "SCR:"); |