diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 04:59:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 05:01:26 +0300 |
commit | 341d5b08b0f6743ddd03bc9868a96d311b509900 (patch) | |
tree | 2f6479e76330932ad8ab96bb6c9afe5bceca4593 /source/blender/editors/include | |
parent | a48bd6cc74298cbd5ed66c8ab8de33f3713950c8 (diff) |
Fix adding objects in local view
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_gpencil.h | 3 | ||||
-rw-r--r-- | source/blender/editors/include/ED_object.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 3ea0dbf10fa..62f8873d4bd 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -235,7 +235,8 @@ void ED_gpencil_create_monkey(struct bContext *C, float mat[4][4]); void ED_gpencil_create_stroke(struct bContext *C, float mat[4][4]); /* ------------ Object Utilities ------------ */ -struct Object *ED_add_gpencil_object(struct bContext *C, struct Scene *scene, const float loc[3]); +struct Object *ED_add_gpencil_object( + struct bContext *C, struct Scene *scene, const float loc[3], unsigned short local_view_bits); void ED_gpencil_add_defaults(struct bContext *C); /* set object modes */ void ED_gpencil_setup_modes(struct bContext *C, struct bGPdata *gpd, int newmode); diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index a6be1c833eb..58a7e5a1203 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -178,14 +178,15 @@ void ED_object_add_unit_props_size(struct wmOperatorType *ot); void ED_object_add_unit_props_radius(struct wmOperatorType *ot); void ED_object_add_generic_props(struct wmOperatorType *ot, bool do_editmode); void ED_object_add_mesh_props(struct wmOperatorType *ot); -bool ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op, const char view_align_axis, - float loc[3], float rot[3], - bool *enter_editmode, bool *is_view_aligned); +bool ED_object_add_generic_get_opts( + struct bContext *C, struct wmOperator *op, const char view_align_axis, + float loc[3], float rot[3], + bool *enter_editmode, unsigned short *local_view_bits, bool *is_view_aligned); struct Object *ED_object_add_type( struct bContext *C, int type, const char *name, const float loc[3], const float rot[3], - bool enter_editmode) + bool enter_editmode, unsigned short local_view_bits) ATTR_NONNULL(1) ATTR_RETURNS_NONNULL; void ED_object_single_users(struct Main *bmain, struct Scene *scene, const bool full, const bool copy_groups); |