diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-20 06:56:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-20 06:56:51 +0400 |
| commit | 33b8d53224071f1b491b18cec77461797e28ce71 (patch) | |
| tree | ec7b07245d40d78be7c185b2be4b99ac4028c42b /source/blender/blenkernel | |
| parent | 6931decd23cd298e26e0599f828158ddf0d6bacb (diff) | |
minor cleanup & replace inline armature separate pchan searches with BLI_findstring(), no functional changes.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 7f8f9b5bb4b..4f921f005f4 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -1416,8 +1416,7 @@ static void ipo_to_animato (ID *id, Ipo *ipo, char actname[], char constname[], /* if this IPO block doesn't have any users after this one, free... */ ipo->id.us--; - if ( (ipo->id.us == 0) || ((ipo->id.us == 1) && (ipo->id.flag & LIB_FAKEUSER)) ) - { + if (ID_REAL_USERS(ipo) <= 0) { IpoCurve *icn; for (icu= ipo->curve.first; icu; icu= icn) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 74f66837b44..488ede5c072 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2271,7 +2271,7 @@ void what_does_parent(Scene *scene, Object *ob, Object *workob) workob->constraints.first = ob->constraints.first; workob->constraints.last = ob->constraints.last; - strcpy(workob->parsubstr, ob->parsubstr); + BLI_strncpy(workob->parsubstr, ob->parsubstr, sizeof(workob->parsubstr)); where_is_object(scene, workob); } |