diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
| commit | b7cd9ec3ada529bf1d57cf08cc96851ceb67a47d (patch) | |
| tree | 4ec25ec70b30c3e4a18b384e1938e3aec957d264 /source/blender/blenkernel/intern/library.c | |
| parent | 6cee7bb2b77bc7b577a3067c30dc56e22b4752ce (diff) | |
| parent | eb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc (diff) | |
Merged changes in the trunk up to revision 52340.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 5b54154a489..db96567a4da 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1535,7 +1535,9 @@ void test_idbutton(char *name) /* search for id */ idtest = BLI_findstring(lb, name, offsetof(ID, name) + 2); - if (idtest) if (new_id(lb, idtest, name) == 0) id_sort_by_name(lb, idtest); + if (idtest && (new_id(lb, idtest, name) == 0)) { + id_sort_by_name(lb, idtest); + } } void text_idbutton(struct ID *id, char *text) |