diff options
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 04e70225f41..2f54c242717 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -28,6 +28,10 @@ #ifndef ED_OBJECT_H #define ED_OBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + struct Base; struct bConstraint; struct bContext; @@ -100,12 +104,9 @@ struct Object *ED_object_add_type(struct bContext *C, int type, float *loc, floa void ED_object_single_users(struct Main *bmain, struct Scene *scene, int full); -/* cleanup */ -int object_is_libdata(struct Object *ob); -int object_data_is_libdata(struct Object *ob); /* object motion paths */ -void ED_objects_clear_paths(struct bContext *C, struct Scene *scene); +void ED_objects_clear_paths(struct bContext *C); void ED_objects_recalculate_paths(struct bContext *C, struct Scene *scene); /* constraints */ @@ -121,7 +122,7 @@ void ED_object_constraint_dependency_update(struct Main *bmain, struct Scene *sc /* object_lattice.c */ int mouse_lattice(struct bContext *C, short mval[2], int extend); -void undo_push_lattice(struct bContext *C, char *name); +void undo_push_lattice(struct bContext *C, const char *name); /* object_lattice.c */ @@ -131,9 +132,9 @@ void ED_setflagsLatt(struct Object *obedit, int flag); enum { MODIFIER_APPLY_DATA=1, MODIFIER_APPLY_SHAPE, -};//eModifier_Apply_Mode +} eModifier_Apply_Mode; -struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, 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); int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct ModifierData *md); 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); @@ -141,5 +142,9 @@ int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, s int ED_object_modifier_apply(struct ReportList *reports, 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); +#ifdef __cplusplus +} +#endif + #endif /* ED_OBJECT_H */ |