Fix T52481: After making all local, local proxies of linked data get broken after...
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 25 Aug 2017 14:11:35 +0000 (16:11 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 25 Aug 2017 14:16:32 +0000 (16:16 +0200)
Issue was nasty hidden one, the dual status (mix of local and linked)
of proxies striking again.

Here, remapping process was considering obdata pointer of proxies as
indirect usage, hence clearing the 'LIB_TAG_EXTERN' of obdata pointer.
That would make savetoblend code not store any 'lib placeholder' for
obdata data-block, which was hence lost on next file read.

Another (probably better) solution here would be to actually consider
obdata of proxies are fully indirect usage, and simply reassign proxies
from their linked object's obdata on file read...

However, that change shall be safer for now, probably good for 2.79 too.

source/blender/blenkernel/intern/library_remap.c

index 1794d74576738b9a01c299acef0e78475e273cde..f8c193fe1085f0bd33825d4c69d31fa520978f80 100644 (file)
@@ -186,8 +186,8 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id
                const bool skip_never_null = (id_remap_data->flag & ID_REMAP_SKIP_NEVER_NULL_USAGE) != 0;
 
 #ifdef DEBUG_PRINT
-               printf("In %s: Remapping %s (%p) to %s (%p) (skip_indirect: %d)\n",
-                      id->name, old_id->name, old_id, new_id ? new_id->name : "<NONE>", new_id, skip_indirect);
+               printf("In %s: Remapping %s (%p) to %s (%p) (is_indirect: %d, skip_indirect: %d)\n",
+                      id->name, old_id->name, old_id, new_id ? new_id->name : "<NONE>", new_id, is_indirect, skip_indirect);
 #endif
 
                if ((id_remap_data->flag & ID_REMAP_FLAG_NEVER_NULL_USAGE) && (cb_flag & IDWALK_CB_NEVER_NULL)) {
@@ -201,6 +201,14 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id
                {
                        if (is_indirect) {
                                id_remap_data->skipped_indirect++;
+                               if (is_obj) {
+                                       Object *ob = (Object *)id;
+                                       if (ob->data == *id_p && ob->proxy != NULL) {
+                                               /* And another 'Proudly brought to you by Proxy Hell' hack!
+                                                * This will allow us to avoid clearing 'LIB_EXTERN' flag of obdata of proxies... */
+                                               id_remap_data->skipped_direct++;
+                                       }
+                               }
                        }
                        else if (is_never_null || is_obj_editmode) {
                                id_remap_data->skipped_direct++;