[Bf-blender-cvs] [3600e94ebac] blender2.7: BKE Library handling: add function to recompute usercounts of IDs.
Bastien Montagne
noreply at git.blender.org
Wed May 22 21:18:54 CEST 2019
Commit: 3600e94ebac0d411042c54ed0970099a7a9cb932
Author: Bastien Montagne
Date: Wed May 22 21:08:51 2019 +0200
Branches: blender2.7
https://developer.blender.org/rB3600e94ebac0d411042c54ed0970099a7a9cb932
BKE Library handling: add function to recompute usercounts of IDs.
This will be needed in undo/redo case, since we do not re-read linked
IDs, their usercounts become total garbage (especially in 'used by local
ID' cases)...
===================================================================
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 493873bc840..0b781f95811 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -180,6 +180,8 @@ void BKE_main_id_flag_all(struct Main *bmain, const int flag, const bool value);
void BKE_main_id_clear_newpoins(struct Main *bmain);
+void BLE_main_id_refcount_recompute(struct Main *bmain, const bool do_linked_only);
+
void BKE_main_lib_objects_recalc_all(struct Main *bmain);
/* (MAX_ID_NAME - 2) + 3 */
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 16f0fc080eb..aa6ce744afd 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1883,6 +1883,62 @@ void BKE_main_id_clear_newpoins(Main *bmain)
}
+static int id_refcount_recompute_callback(
+ void *user_data, struct ID *UNUSED(id_self), struct ID **id_pointer, int cb_flag)
+{
+ const bool do_linked_only = (bool)POINTER_AS_INT(user_data);
+
+ if (*id_pointer == NULL) {
+ return IDWALK_RET_NOP;
+ }
+ if (do_linked_only && !ID_IS_LINKED(*id_pointer)) {
+ return IDWALK_RET_NOP;
+ }
+
+ if (cb_flag & IDWALK_CB_USER) {
+ /* Do not touch to direct/indirect linked status here... */
+ id_us_plus_no_lib(*id_pointer);
+ }
+ if (cb_flag & IDWALK_CB_USER_ONE) {
+ id_us_ensure_real(*id_pointer);
+ }
+
+ return IDWALK_RET_NOP;
+}
+
+void BLE_main_id_refcount_recompute(struct Main *bmain, const bool do_linked_only)
+{
+ ListBase *lbarray[MAX_LIBARRAY];
+ ID *id;
+ int a;
+
+ /* Reset usercount of all affected IDs. */
+ const int nbr_lb = a = set_listbasepointers(bmain, lbarray);
+ while (a--) {
+ for(id = lbarray[a]->first; id != NULL; id = id->next) {
+ if (!ID_IS_LINKED(id) && do_linked_only) {
+ continue;
+ }
+ id->us = ID_FAKE_USERS(id);
+ /* Note that we keep EXTRAUSER tag here, since some UI users may define it too... */
+ if (id->tag & LIB_TAG_EXTRAUSER) {
+ id->tag &= ~(LIB_TAG_EXTRAUSER | LIB_TAG_EXTRAUSER_SET);
+ id_us_ensure_real(id);
+ }
+ }
+ }
+
+ /* Go over whole Main database to re-generate proper usercounts... */
+ a = nbr_lb;
+ while (a--) {
+ for(id = lbarray[a]->first; id != NULL; id = id->next) {
+ BKE_library_foreach_ID_link(
+ bmain, id, id_refcount_recompute_callback, POINTER_FROM_INT((int)do_linked_only), IDWALK_READONLY);
+ }
+ }
+}
+
+
static void library_make_local_copying_check(ID *id, GSet *loop_tags, MainIDRelations *id_relations, GSet *done_ids)
{
if (BLI_gset_haskey(done_ids, id)) {
More information about the Bf-blender-cvs
mailing list