Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:39:32 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:39:32 +0300
commitc26da06ae67348f62b27af33b76f2d18e6c7c274 (patch)
tree599d76f3b8ce2dc08b20e5617d11854314d12da2 /source/blender/blenkernel/intern/library_query.c
parent84d4476eb11cddcc88c8271c22bb8d1051421f0d (diff)
parent96e507d9890e42695ea0c6bff0c8fa5c480bbb5a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/library_query.c')
-rw-r--r--source/blender/blenkernel/intern/library_query.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 4074e0f0dc6..317f743acf1 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1094,7 +1094,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
return true;
#endif
case ID_ME:
- return ELEM(id_type_used, ID_ME, ID_KE, ID_MA);
+ return ELEM(id_type_used, ID_ME, ID_KE, ID_MA, ID_IM);
case ID_CU:
return ELEM(id_type_used, ID_OB, ID_KE, ID_MA, ID_VF);
case ID_MB: