[Bf-blender-cvs] [759b97cc191] uuid-id: Merge branch 'master' into uuid-id

[Bastien Montagne]

Commit: 759b97cc1910c46bf2f6345e25f3cae0a96ef083
Author: Bastien Montagne
Date:   Tue Mar 3 11:11:40 2020 +0100
Branches: uuid-id
https://developer.blender.org/rB759b97cc1910c46bf2f6345e25f3cae0a96ef083

Merge branch 'master' into uuid-id

Conflicts:
	source/blender/blenkernel/BKE_main_idmap.h

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



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

diff --cc source/blender/blenkernel/BKE_main_idmap.h
index 7523ab48a1e,a68d27a7882..e392b7db60e
--- a/source/blender/blenkernel/BKE_main_idmap.h
+++ b/source/blender/blenkernel/BKE_main_idmap.h
@@@ -58,8 -56,8 +62,12 @@@ struct ID *BKE_main_idmap_lookup_id(str
                                      const struct ID *id) ATTR_WARN_UNUSED_RESULT
      ATTR_NONNULL(1, 2);
  
 +struct ID *BKE_main_idmap_lookup_uuid(struct IDNameLib_Map *id_typemap,
 +                                      const uint session_uuid) ATTR_WARN_UNUSED_RESULT
 +    ATTR_NONNULL(1);
 +
+ #ifdef __cplusplus
+ }
+ #endif
+ 
  #endif /* __BKE_MAIN_IDMAP_H__ */