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/editors/object | |
| 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/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 7dfca69d7f0..5af586942dc 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2798,7 +2798,7 @@ void OBJECT_OT_convert(wmOperatorType *ot) /* leaves selection of base/object unaltered */ /* Does set ID->newid pointers. */ static Base *object_add_duplicate_internal( - Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob, int dupflag) + Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob, const eDupli_ID_Flags dupflag) { Base *base, *basen = NULL; Object *obn; @@ -2846,7 +2846,7 @@ static Base *object_add_duplicate_internal( * note: caller must do DAG_relations_tag_update(bmain); * this is not done automatic since we may duplicate many objects in a batch */ Base *ED_object_add_duplicate( - Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, int dupflag) + Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, const eDupli_ID_Flags dupflag) { Base *basen; Object *ob; @@ -2879,7 +2879,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); const bool linked = RNA_boolean_get(op->ptr, "linked"); - int dupflag = (linked) ? 0 : U.dupflag; + const eDupli_ID_Flags dupflag = (linked) ? 0 : (eDupli_ID_Flags)U.dupflag; CTX_DATA_BEGIN (C, Base *, base, selected_bases) { Base *basen = object_add_duplicate_internal(bmain, scene, view_layer, base->object, dupflag); @@ -2963,7 +2963,7 @@ static int add_named_exec(bContext *C, wmOperator *op) Base *basen; Object *ob; const bool linked = RNA_boolean_get(op->ptr, "linked"); - int dupflag = (linked) ? 0 : U.dupflag; + const eDupli_ID_Flags dupflag = (linked) ? 0 : (eDupli_ID_Flags)U.dupflag; char name[MAX_ID_NAME - 2]; /* find object, create fake base */ |