[Bf-blender-cvs] [bc81bfb9ab4] uuid-undo-experiments-swap-reread-datablocks: Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Bastien Montagne noreply at git.blender.org
Thu Mar 5 14:27:49 CET 2020


Commit: bc81bfb9ab48f06552d909fa4f98236cf573e280
Author: Bastien Montagne
Date:   Thu Mar 5 12:45:46 2020 +0100
Branches: uuid-undo-experiments-swap-reread-datablocks
https://developer.blender.org/rBbc81bfb9ab48f06552d909fa4f98236cf573e280

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

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



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

diff --cc source/blender/blenkernel/BKE_lib_id.h
index ed6837db2a0,4ce5691543f..e086cf13e03
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@@ -210,13 -216,9 +216,12 @@@ bool id_single_user(struct bContext *C
  bool BKE_id_copy_is_allowed(const struct ID *id);
  bool BKE_id_copy(struct Main *bmain, const struct ID *id, struct ID **newid);
  bool BKE_id_copy_ex(struct Main *bmain, const struct ID *id, struct ID **r_newid, const int flag);
 +
  void BKE_id_swap(struct Main *bmain, struct ID *id_a, struct ID *id_b);
 +void BKE_id_full_swap(struct Main *bmain, struct ID *id_a, struct ID *id_b);
 +
  void id_sort_by_name(struct ListBase *lb, struct ID *id, struct ID *id_sorting_hint);
- void BKE_id_expand_local(struct Main *bmain, struct ID *id);
- void BKE_id_copy_ensure_local(struct Main *bmain, const struct ID *old_id, struct ID *new_id);
+ void BKE_lib_id_expand_local(struct Main *bmain, struct ID *id);
  
  bool BKE_id_new_name_validate(struct ListBase *lb, struct ID *id, const char *name)
      ATTR_NONNULL(1, 2);



More information about the Bf-blender-cvs mailing list