diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
| commit | c5f6a01dd5998976addd2085470bb73a150579e5 (patch) | |
| tree | 42b3345fb3ea2e7607a6d1eec379b8ce23b5ffbc /source/blender/blenkernel/BKE_scene.h | |
| parent | 4cf62f1e7e2bb28b47f79e4bd7c1482ab742ebbd (diff) | |
| parent | 9e9e028f059f29d493dc020dda965a9bea8ffd6b (diff) | |
synched with trunk at revision 34793
Diffstat (limited to 'source/blender/blenkernel/BKE_scene.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 96ef8d44cf4..2337b95dcbc 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -31,6 +31,10 @@ #ifndef BKE_SCENE_H #define BKE_SCENE_H +#ifdef __cplusplus +extern "C" { +#endif + struct AviCodecData; struct Base; struct bglMats; @@ -47,20 +51,20 @@ struct Text; #define SCE_COPY_LINK_DATA 2 #define SCE_COPY_FULL 3 -#define SETLOOPER(s, b) sce= s, b= _setlooper_base_step(&sce, NULL); b; b= _setlooper_base_step(&sce, b) -struct Base *_setlooper_base_step(struct Scene **sce, struct Base *base); +#define SETLOOPER(_sce_basis, _sce_iter, _base) _sce_iter= _sce_basis, _base= _setlooper_base_step(&_sce_iter, NULL); _base; _base= _setlooper_base_step(&_sce_iter, _base) +struct Base *_setlooper_base_step(struct Scene **sce_iter, struct Base *base); void free_avicodecdata(struct AviCodecData *acd); void free_qtcodecdata(struct QuicktimeCodecData *acd); void free_scene(struct Scene *sce); -struct Scene *add_scene(char *name); +struct Scene *add_scene(const char *name); struct Base *object_in_scene(struct Object *ob, struct Scene *sce); void set_scene_bg(struct Main *bmain, struct Scene *sce); -struct Scene *set_scene_name(struct Main *bmain, char *name); +struct Scene *set_scene_name(struct Main *bmain, const char *name); -struct Scene *copy_scene(struct Main *bmain, struct Scene *sce, int type); +struct Scene *copy_scene(struct Scene *sce, int type); void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce); int next_object(struct Scene **scene, int val, struct Base **base, struct Object **ob); @@ -72,6 +76,7 @@ char *scene_find_marker_name(struct Scene *scene, int frame); char *scene_find_last_marker_name(struct Scene *scene, int frame); int scene_marker_tfm_translate(struct Scene *scene, int delta, int flag); int scene_marker_tfm_extend(struct Scene *scene, int delta, int flag, int frame, char side); +int scene_marker_tfm_scale(struct Scene *scene, float value, int flag); struct Base *scene_add_base(struct Scene *sce, struct Object *ob); void scene_deselect_all(struct Scene *sce); @@ -93,5 +98,9 @@ int get_render_child_particle_number(struct RenderData *r, int num); int get_render_shadow_samples(struct RenderData *r, int samples); float get_render_aosss_error(struct RenderData *r, float error); +#ifdef __cplusplus +} +#endif + #endif |