[Bf-blender-cvs] [63b8f0d928c] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 63b8f0d928cd346a537dbbadeeb660d7d9c5af0a
Author: Mateusz Grzeliński
Date:   Mon Aug 3 10:45:52 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB63b8f0d928cd346a537dbbadeeb660d7d9c5af0a

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/blenkernel/BKE_global.h

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/image.c
index e1ee0559ee1,e331e5ae1dd..d9f0516d5d6
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -4161,12 -4154,10 +4161,12 @@@ static ImBuf *image_load_sequence_multi
  
        BKE_imbuf_stamp_info(ima->rr, ibuf);
  
-       image_initialize_after_load(ima, iuser, ibuf);
+       image_init_after_load(ima, iuser, ibuf);
        image_assign_ibuf(ima, ibuf, iuser ? iuser->multi_index : 0, entry);
      }
 -    // else printf("pass not found\n");
 +    else {
 +      CLOG_VERBOSE(&LOG, 3, "render pass not found");
 +    }
    }
    else {
      tile->ok = 0;
diff --cc source/blender/blenloader/intern/versioning_290.c
index 87e91f42143,c4c697254bd..3760c205a26
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -22,10 -22,11 +22,12 @@@
  
  #include "BLI_listbase.h"
  #include "BLI_math.h"
+ #include "BLI_string.h"
  #include "BLI_utildefines.h"
 +#include <BKE_report.h>
  
  #include "DNA_brush_types.h"
+ #include "DNA_cachefile_types.h"
  #include "DNA_constraint_types.h"
  #include "DNA_genfile.h"
  #include "DNA_gpencil_modifier_types.h"