diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 09:49:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 09:49:34 +0300 |
commit | cb22caa8c78ad2f4453a83683c97effb7fde862d (patch) | |
tree | c3c27a2e2d9a174d5b6fcbee4b0693afdb1f85f5 /source/blender/editors/include | |
parent | 0e0502cbdf9d13a72c96a645c5d886210118ab50 (diff) | |
parent | 18c12803bd8b48b66c2103b3107f68bb5d0287c5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 8e844d327e2..efa779c29a1 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -125,12 +125,12 @@ enum { EM_IGNORE_LAYER = (1 << 3), EM_NO_CONTEXT = (1 << 4), }; -void ED_object_editmode_exit_ex( +bool ED_object_editmode_exit_ex( struct Scene *scene, struct Object *obedit, int flag); -void ED_object_editmode_exit(struct bContext *C, int flag); +bool ED_object_editmode_exit(struct bContext *C, int flag); -void ED_object_editmode_enter_ex(struct Scene *scene, struct Object *ob, int flag); -void ED_object_editmode_enter(struct bContext *C, int flag); +bool ED_object_editmode_enter_ex(struct Scene *scene, struct Object *ob, int flag); +bool ED_object_editmode_enter(struct bContext *C, int flag); bool ED_object_editmode_load(struct Object *obedit); bool ED_object_editmode_calc_active_center(struct Object *obedit, const bool select_only, float r_center[3]); @@ -232,17 +232,20 @@ enum { MODIFIER_APPLY_SHAPE }; -struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, - struct Object *ob, const char *name, int type); +struct ModifierData *ED_object_modifier_add( + struct ReportList *reports, struct Main *bmain, struct Scene *scene, + struct Object *ob, const char *name, int type); bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Object *ob, struct ModifierData *md); void ED_object_modifier_clear(struct Main *bmain, struct Object *ob); int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md); -int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene, - struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md); -int ED_object_modifier_apply(struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, struct ModifierData *md, int mode); +int ED_object_modifier_convert( + struct ReportList *reports, struct Main *bmain, struct Scene *scene, + struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md); +int ED_object_modifier_apply( + struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, struct ModifierData *md, int mode); int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md); bool ED_object_iter_other( @@ -262,7 +265,8 @@ const struct EnumPropertyItem *ED_object_vgroup_selection_itemf_helper( bool *r_free, const unsigned int selection_mask); -void ED_object_check_force_modifiers(struct Main *bmain, struct Scene *scene, struct Object *object); +void ED_object_check_force_modifiers( + struct Main *bmain, struct Scene *scene, struct Object *object); /* object_facemap_ops.c */ void ED_object_facemap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum); |