diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/editors/object/object_intern.h | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/editors/object/object_intern.h')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 352ba744d92..559bb434f9d 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -24,6 +24,10 @@ #ifndef __OBJECT_INTERN_H__ #define __OBJECT_INTERN_H__ +#ifdef __cplusplus +extern "C" { +#endif + struct Object; struct StructRNA; struct bContext; @@ -111,6 +115,8 @@ void OBJECT_OT_light_add(struct wmOperatorType *ot); void OBJECT_OT_effector_add(struct wmOperatorType *ot); void OBJECT_OT_camera_add(struct wmOperatorType *ot); void OBJECT_OT_speaker_add(struct wmOperatorType *ot); +void OBJECT_OT_hair_add(struct wmOperatorType *ot); +void OBJECT_OT_pointcloud_add(struct wmOperatorType *ot); void OBJECT_OT_collection_instance_add(struct wmOperatorType *ot); void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot); @@ -120,6 +126,10 @@ void OBJECT_OT_join(struct wmOperatorType *ot); void OBJECT_OT_join_shapes(struct wmOperatorType *ot); void OBJECT_OT_convert(struct wmOperatorType *ot); +/* object_volume.c */ +void OBJECT_OT_volume_add(struct wmOperatorType *ot); +void OBJECT_OT_volume_import(struct wmOperatorType *ot); + /* object_hook.c */ void OBJECT_OT_hook_add_selob(struct wmOperatorType *ot); void OBJECT_OT_hook_add_newob(struct wmOperatorType *ot); @@ -287,4 +297,8 @@ void OBJECT_OT_quadriflow_remesh(struct wmOperatorType *ot); void OBJECT_OT_data_transfer(struct wmOperatorType *ot); void OBJECT_OT_datalayout_transfer(struct wmOperatorType *ot); +#ifdef __cplusplus +} +#endif + #endif /* __OBJECT_INTERN_H__ */ |