diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-31 23:07:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-31 23:07:25 +0400 |
| commit | c7fbeded4c6cce637f4d64c366d12070d15d2f0c (patch) | |
| tree | fe1364dcc4b054865b6e7b38f029e1ed54ae920d /source/blender/blenkernel/BKE_idprop.h | |
| parent | ae097e72a35f4cff8eaa242b7b17f596c2051907 (diff) | |
add IDP_MergeGroup(dst, src, overwrite) function,
like PyDict_Merge()
Diffstat (limited to 'source/blender/blenkernel/BKE_idprop.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 3cf4a2c5cdc..027f06ef84f 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -154,6 +154,12 @@ __attribute__((nonnull)) #endif ; +void IDP_MergeGroup(IDProperty *dest, IDProperty *src, const int do_overwrite) +#ifdef __GNUC__ +__attribute__((nonnull)) +#endif +; + /** * This function has a sanity check to make sure ID properties with the same name don't * get added to the group. |