diff options
author | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:14:50 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:40:30 +0300 |
commit | 94fba47513239a2ea20722d7d68b19e7e69e6b26 (patch) | |
tree | 9a64a84d583e628eeba29f4fb76df9411711cb3e /source/blender/blenkernel | |
parent | 9e307117f8399eb84f1c4932a1f577ecdd0c8a2d (diff) |
Cleanup: use explicit enum type for duplicate option of `BKE_object_duplicate`
Using enum type itself in implementations, and uint in headers (as using
enums types in headers is a pain when enum are not defined and used in a
single same header file...).
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 3710ec810ce..4096c4f2ec1 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -138,7 +138,7 @@ bool BKE_object_obdata_is_libdata(const struct Object *ob); struct Object *BKE_object_duplicate(struct Main *bmain, const struct Object *ob, - const int dupflag); + const uint dupflag); void BKE_object_obdata_size_init(struct Object *ob, const float scale); diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 1d084c8ab02..9abcce7c38f 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -391,7 +391,7 @@ static Collection *collection_duplicate_recursive(Main *bmain, } if (ob_new == NULL) { - ob_new = BKE_object_duplicate(bmain, ob_old, object_dupflag); + ob_new = BKE_object_duplicate(bmain, ob_old, (eDupli_ID_Flags)object_dupflag); ID_NEW_SET(ob_old, ob_new); } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 127c5243c7e..fd7ddc9eb6d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1758,7 +1758,7 @@ Object *BKE_object_copy(Main *bmain, const Object *ob) * \note Caller MUST free \a newid pointers itself (#BKE_main_id_clear_newpoins()) and call updates * of DEG too (#DAG_relations_tag_update()). */ -Object *BKE_object_duplicate(Main *bmain, const Object *ob, const int dupflag) +Object *BKE_object_duplicate(Main *bmain, const Object *ob, const uint dupflag) { Material ***matarar; ID *id; |