diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-07 23:54:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-07 23:54:52 +0300 |
| commit | 749caf49845401656d13124b9692e51d0dc77bc5 (patch) | |
| tree | 203c5d9be6a0bfe52e992b9b96db886dd592a7bd | |
| parent | af425f3f7a08c09f7fbc7076b364fac75163b296 (diff) | |
| parent | 843271d0a5adec1059f91f7fd8854936a1228807 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/windowmanager/intern/wm_files_link.c
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index cd6a38cb9a8..dc6d22b58d5 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -614,7 +614,6 @@ static void lib_relocate_do( LinkNode *itemlink; int item_idx; - bool has_item = false; /* Remove all IDs to be reloaded from Main. */ lba_idx = set_listbasepointers(bmain, lbarray); @@ -636,7 +635,6 @@ static void lib_relocate_do( BLI_remlink(lbarray[lba_idx], id); item = wm_link_append_data_item_add(lapp_data, id->name + 2, idcode, id); BLI_BITMAP_SET_ALL(item->libraries, true, lapp_data->num_libraries); - has_item = true; #ifdef PRINT_DEBUG printf("\tdatablock to seek for: %s\n", id->name); @@ -645,8 +643,8 @@ static void lib_relocate_do( } } - if (!has_item) { - /* nothing to relocate */ + if (lapp_data->num_items == 0) { + /* Early out in case there is nothing to do. */ return; } |