[Bf-blender-cvs] [9e6cdd8] id-remap: Merge branch 'master' into id-remap
Bastien Montagne
noreply at git.blender.org
Wed Nov 11 10:48:23 CET 2015
Commit: 9e6cdd8e3a0e3c6df6b89b3a9ffff05c6f97234a
Author: Bastien Montagne
Date: Tue Nov 10 20:52:58 2015 +0100
Branches: id-remap
https://developer.blender.org/rB9e6cdd8e3a0e3c6df6b89b3a9ffff05c6f97234a
Merge branch 'master' into id-remap
Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
Also clears now useless 'bool is_user_one' flag from editors' ID remap callback.
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_library.h
index e3764d3,9a961ba..5b8f741
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@@ -127,9 -118,13 +127,13 @@@ void BKE_library_make_local(struct Mai
struct ID *BKE_libblock_find_name_ex(struct Main *bmain, const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
- void BKE_library_callback_free_window_manager_set(void (*func)(struct bContext *, struct wmWindowManager *));
- void BKE_library_callback_free_notifier_reference_set(void (*func)(const void *));
- void BKE_library_callback_remap_editor_id_reference_set(bool (*func)(struct ID *, struct ID *));
+ typedef void (*BKE_library_free_window_manager_cb)(struct bContext *, struct wmWindowManager *);
+ typedef void (*BKE_library_free_notifier_reference_cb)(const void *);
-typedef void (*BKE_library_free_editor_id_reference_cb)(const struct ID *);
++typedef void (*BKE_library_remap_editor_id_reference_cb)(struct ID *, struct ID *);
+
+ void BKE_library_callback_free_window_manager_set(BKE_library_free_window_manager_cb func);
+ void BKE_library_callback_free_notifier_reference_set(BKE_library_free_notifier_reference_cb func);
-void BKE_library_callback_free_editor_id_reference_set(BKE_library_free_editor_id_reference_cb func);
++void BKE_library_callback_remap_editor_id_reference_set(BKE_library_remap_editor_id_reference_cb func);
/* use when "" is given to new_id() */
#define ID_FALLBACK_NAME N_("Untitled")
diff --cc source/blender/blenkernel/BKE_screen.h
index e89888c,4861641..d74a61c
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@@ -98,9 -98,6 +98,9 @@@ typedef struct SpaceType
/* return context data */
int (*context)(const struct bContext *, const char *, struct bContextDataResult *);
+ /* Used when we want to replace an ID by another (or NULL). */
- bool (*id_remap)(struct ScrArea *, struct SpaceLink *, struct ID *, struct ID *);
++ void (*id_remap)(struct ScrArea *, struct SpaceLink *, struct ID *, struct ID *);
+
/* region type definitions */
ListBase regiontypes;
@@@ -276,8 -273,8 +276,8 @@@ void BKE_spacedata_freelist(ListBase *l
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
void BKE_spacedata_draw_locks(int set);
- void BKE_spacedata_callback_id_remap_set(bool (*func)(struct ScrArea *, struct SpaceLink *, struct ID *, struct ID *));
-void BKE_spacedata_callback_id_unref_set(void (*func)(struct SpaceLink *sl, const struct ID *));
-void BKE_spacedata_id_unref(struct SpaceLink *sl, const struct ID *id);
++void BKE_spacedata_callback_id_remap_set(void (*func)(struct ScrArea *, struct SpaceLink *, struct ID *, struct ID *));
+void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID *id);
/* area/regions */
struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
diff --cc source/blender/blenkernel/intern/library.c
index 8f3a6f7,e8f02ee..8df8c16
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1016,325 -1035,11 +1016,325 @@@ void BKE_library_callback_free_notifier
free_notifier_reference_cb = func;
}
- static bool (*remap_editor_id_reference_cb)(ID *, ID *) = NULL;
-static BKE_library_free_editor_id_reference_cb free_editor_id_reference_cb = NULL;
++static BKE_library_remap_editor_id_reference_cb remap_editor_id_reference_cb = NULL;
+
- void BKE_library_callback_remap_editor_id_reference_set(bool (*func)(ID *, ID *))
++void BKE_library_callback_remap_editor_id_reference_set(BKE_library_remap_editor_id_reference_cb func)
+{
+ remap_editor_id_reference_cb = func;
+}
+
+typedef struct IDRemap {
+ ID *old_id;
+ ID *new_id;
+ ID *id; /* The ID in which we are replacing old_id by new_id usages. */
+ int flag;
+
+ int skipped_direct; /* Number of direct usecases that could not be remapped (e.g.: obdata when in edit mode). */
+ int skipped_indirect; /* Number of indirect usecases that could not be remapped. */
+ int skipped_refcounted; /* Number of skipped usecases that refcount the datablock. */
+} IDRemap;
+
+enum {
+ /* Set by caller. */
+ ID_REMAP_SKIP_INDIRECT_USAGE = 1 << 0,
+
+ /* Set by callback. */
+ ID_REMAP_IS_LINKED_DIRECT = 1 << 16, /* new_id is directly linked in current .blend. */
+ ID_REMAP_IS_USER_ONE_SKIPPED = 1 << 17, /* there was some skipped 'user_one' usages of old_id. */
+};
+
+static bool foreach_libblock_remap_callback(void *user_data, ID **id_p, int cb_flag)
+{
+ IDRemap *id_remap_data = user_data;
+ ID *old_id = id_remap_data->old_id;
+ ID *new_id = id_remap_data->new_id;
+ ID *id = id_remap_data->id;
+
+ if (!old_id) { /* Used to cleanup all IDs used by a specific one. */
+ BLI_assert(!new_id);
+ old_id = *id_p;
+ }
+
+ if (*id_p && (*id_p == old_id)) {
+ /* Note: proxy usage implies LIB_EXTERN, so on this aspect it is direct,
+ * on the other hand since they get reset to lib data on file open/reload it is indirect too...
+ * Edit Mode is also a 'skip direct' case. */
+ const bool is_obj = (GS(id->name) == ID_OB);
+ const bool is_proxy = (is_obj && (((Object *)id)->proxy || ((Object *)id)->proxy_group));
+ const bool is_obj_editmode = (is_obj && BKE_object_is_in_editmode((Object *)id));
+ const bool is_indirect = (id->lib != NULL);
+ const bool skip_indirect = (id_remap_data->flag & ID_REMAP_SKIP_INDIRECT_USAGE) != 0;
+ const bool is_never_null = ((cb_flag & IDWALK_NEVER_NULL) && (new_id == NULL));
+
+ printf("\t\tIn %s (%p): remapping %s (%p) to %s (%p)\n",
+ id->name, id, old_id->name, old_id, new_id ? new_id->name : "", new_id);
+
+ /* Special hack in case it's Object->data and we are in edit mode (skipped_direct too). */
+ if (is_never_null ||
+ (is_obj_editmode && (((Object *)id)->data == *id_p)) ||
+ (skip_indirect && (is_proxy || is_indirect)))
+ {
+ if (is_never_null || is_proxy || is_obj_editmode) {
+ id_remap_data->skipped_direct++;
+ }
+ else {
+ id_remap_data->skipped_indirect++;
+ }
+ if (cb_flag & IDWALK_USER) {
+ id_remap_data->skipped_refcounted++;
+ }
+ else if (cb_flag & IDWALK_USER_ONE) {
+ /* No need to count number of times this happens, just a flag is enough. */
+ id_remap_data->flag |= ID_REMAP_IS_USER_ONE_SKIPPED;
+ }
+ }
+ else {
+ *id_p = new_id;
+ if (cb_flag & IDWALK_USER) {
+ id_us_min(old_id);
+ /* We do not want to handle LIB_INDIRECT/LIB_EXTERN here. */
+ if (new_id)
+ new_id->us++;
+ }
+ else if (cb_flag & IDWALK_USER_ONE) {
+ id_us_ensure_real(new_id);
+ /* We cannot affect old_id->us directly, LIB_EXTRAUSER(_SET) are assumed to be set as needed,
+ * that extra user is processed in final handling... */
+ }
+ if (!is_indirect) {
+ id_remap_data->flag |= ID_REMAP_IS_LINKED_DIRECT;
+ }
+ }
+ }
+
+ return true;
+}
+
+/**
+ * Execute the 'data' part of the remapping (that is, all ID pointers from other ID datablocks).
+ *
+ * Behavior differs depending on whether given \a id is NULL or not:
+ * - \a id NULL: \a old_id must be non-NULL, \a new_id may be NULL (unlinking \a old_id) or not
+ * (remapping \a old_id to \a new_id). The whole \a bmain database is checked, and all pointers to \a old_id
+ * are remapped to \a new_id.
+ * - \a id is non-NULL:
+ * + If \a old_id is NULL, \a new_id must also be NULL, and all ID pointers from \a id are cleared (i.e. \a id
+ * does not references any other datablock anymore).
+ * + If \a old_id is non-NULL, behavior is as with a NULL \a id, but only for given \a id.
+ *
+ * \param bmain the Main data storage to operate on (can be NULL if \a id is non-NULL).
+ * \param id the datablock to operate on (can be NULL if \a bmain is non-NULL).
+ * \param old_id the datablock to dereference (may be NULL if \a id is non-NULL).
+ * \param new_id the new datablock to replace \a old_id references with (may be NULL).
+ * \param skip_indirect_usage if true, do not remap/unlink indirect usages of \a old_id datablock.
+ * \param r_id_remap_data if non-NULL, the IDRemap struct to use (uselful to retrieve info about remapping process).
+ * \return true is there was some 'user_one' users of \a old_id (needed to handle correctly #old_id->us count).
+ */
+static void libblock_remap_data(
+ Main *bmain, ID *id, ID *old_id, ID *new_id, const bool skip_indirect_usage, IDRemap *r_id_remap_data)
+{
+ IDRemap id_remap_data;
+ ListBase *lb_array[MAX_LIBARRAY];
+ int i;
+
+ if (r_id_remap_data == NULL) {
+ r_id_remap_data = &id_remap_data;
+ }
+ r_id_remap_data->old_id = old_id;
+ r_id_remap_data->new_id = new_id;
+ r_id_remap_data->id = NULL;
+ r_id_remap_data->flag = skip_indirect_usage ? ID_REMAP_SKIP_INDIRECT_USAGE : 0;
+ r_id_remap_data->skipped_direct = 0;
+ r_id_remap_data->skipped_indirect = 0;
+ r_id_remap_data->skipped_refcounted = 0;
+
+ printf("%s: %s (%p) replaced by %s (%p)\n", __func__,
+ old_id ? old_id->name : "", old_id, new_id ? new_id->name : "", new_id);
+
+ if (id) {
+ printf("\tchecking id %s (%p, %p)\n", id->name, id, id->lib);
+ r_id_remap_data->id = id;
+ BKE_library_foreach_ID_link(id, foreach_libblock_remap_callback, (void *)r_id_remap_data, IDWALK_NOP);
+ }
+ else {
+ i = set_listbasepointers(bmain, lb_array);
+
+ /* Note that this is a very 'bruteforce' approach, maybe we could use some depsgraph to only process
+ * objects actually using given old_id... sounds rather unlikely currently, though, so this will do for now. */
+
+ while (i--) {
+ ID *id = lb_array[i]->first;
+
+ for (; id; id = id->next) {
+ /* Note that we cannot skip indirect usages of old_id here (if requested), we still need to check it for
+ * the user count handling...
+ * XXX No more true (except for debug usage of those skipping counters). */
+ printf("\tchecking id %s (%p, %p)\n", id->name, id, id->lib);
+ r_id_remap_data->id = id;
+ BKE_librar
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list