Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / library_query.c
index 8a42a3334bd83ab5718146591afa8b13a266349f..e397dcf76674eb8b20d137fa9d16d365bf25c0c1 100644 (file)
@@ -536,7 +536,8 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 
                                /* Object is special, proxies make things hard... */
                                const int data_cb_flag = data.cb_flag;
-                               const int proxy_cb_flag = (object->proxy || object->proxy_group) ? IDWALK_CB_INDIRECT_USAGE : 0;
+                               const int proxy_cb_flag = ((data.flag & IDWALK_NO_INDIRECT_PROXY_DATA_USAGE) == 0 && (object->proxy || object->proxy_group)) ?
+                                                             IDWALK_CB_INDIRECT_USAGE : 0;
 
                                /* object data special case */
                                data.cb_flag |= proxy_cb_flag;