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/buttons_logic.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/buttons_logic.c')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 2a2cf583129..1a1d7828ef0 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -2536,7 +2536,7 @@ void logic_buts(void) ob= OBACT; if(ob==0) return; - uiSetButLock(ob->id.lib!=0, "Can't edit library data"); + uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); sprintf(name, "buttonswin %d", curarea->win); block= uiNewBlock(&curarea->uiblocks, name, UI_EMBOSS, UI_HELV, curarea->win); @@ -2622,7 +2622,7 @@ void logic_buts(void) for(a=0; a<count; a++) { ob= (Object *)idar[a]; uiClearButLock(); - uiSetButLock(ob->id.lib!=0, "Can't edit library data"); + uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); if( (ob->scavisflag & OB_VIS_SENS) == 0) continue; @@ -2693,7 +2693,7 @@ void logic_buts(void) for(a=0; a<count; a++) { ob= (Object *)idar[a]; uiClearButLock(); - uiSetButLock(ob->id.lib!=0, "Can't edit library data"); + uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); if( (ob->scavisflag & OB_VIS_CONT) == 0) continue; /* presume it is only objects for now */ @@ -2761,7 +2761,7 @@ void logic_buts(void) for(a=0; a<count; a++) { ob= (Object *)idar[a]; uiClearButLock(); - uiSetButLock(ob->id.lib!=0, "Can't edit library data"); + uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); if( (ob->scavisflag & OB_VIS_ACT) == 0) continue; /* presume it is only objects for now */ |