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/editcurve.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/editcurve.c')
-rw-r--r-- | source/blender/src/editcurve.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index e3dc812831b..aeea0300890 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -3655,6 +3655,11 @@ int join_curve(int type) int a; ob= OBACT; + if (object_data_is_libdata(ob)) { + error_libdata(); + return 0; + } + if(!G.vd || ob->type!=type) return 0; if(ob->lay & G.vd->lay); else return 0; tempbase.first= tempbase.last= 0; @@ -3665,7 +3670,7 @@ int join_curve(int type) base= FIRSTBASE; while(base) { nextb= base->next; - if TESTBASELIB(base) { + if TESTBASE(base) { if(base->object->type==type) { if(base->object != ob) { |