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/meshtools.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/meshtools.c')
| -rw-r--r-- | source/blender/src/meshtools.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index cbb14166b36..41a9bece61a 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -135,6 +135,11 @@ int join_mesh(void) ob= OBACT; if(!ob || ob->type!=OB_MESH) return 0; + + if (object_data_is_libdata(ob)) { + error_libdata(); + return 0; + } #ifdef WITH_VERSE /* it isn't allowed to join shared object at verse server |