diff options
author | Martin Poirier <theeth@yahoo.com> | 2008-10-06 21:37:03 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2008-10-06 21:37:03 +0400 |
commit | d16a8649ff6c2b65492a78eab80bcdbefa9dbe9d (patch) | |
tree | 5d2a2bd518cc7de908ad516a28ee8011d9a7e590 /source/blender/include | |
parent | 1513e96857538a5a686439247c0608bd1dfce64a (diff) | |
parent | de6a9d0194abacb1bd2de5283e72440b4916325c (diff) |
merge runk 16887:16950
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BDR_editobject.h | 1 | ||||
-rw-r--r-- | source/blender/include/BDR_gpencil.h | 4 | ||||
-rw-r--r-- | source/blender/include/BIF_editaction.h | 4 | ||||
-rw-r--r-- | source/blender/include/BSE_seqaudio.h | 12 |
4 files changed, 16 insertions, 5 deletions
diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h index bc95c221b51..11e6478f29a 100644 --- a/source/blender/include/BDR_editobject.h +++ b/source/blender/include/BDR_editobject.h @@ -76,6 +76,7 @@ void link_to_scene(unsigned short nr); void make_links_menu(void); void make_links(short event); void make_duplilist_real(void); +void make_object_duplilist_real(struct Base *base); void apply_objects_locrot(void); void apply_objects_scale(void); void apply_objects_rot(void); diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h index 9b9294b0343..82263c8cda7 100644 --- a/source/blender/include/BDR_gpencil.h +++ b/source/blender/include/BDR_gpencil.h @@ -57,10 +57,13 @@ struct bGPDframe *gpencil_frame_addnew(struct bGPDlayer *gpl, int cframe); struct bGPDlayer *gpencil_layer_addnew(struct bGPdata *gpd); struct bGPdata *gpencil_data_addnew(void); +struct bGPDframe *gpencil_frame_duplicate(struct bGPDframe *src); +struct bGPDlayer *gpencil_layer_duplicate(struct bGPDlayer *src); struct bGPdata *gpencil_data_duplicate(struct bGPdata *gpd); struct bGPdata *gpencil_data_getactive(struct ScrArea *sa); short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd); +struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd); void gpencil_frame_delete_laststroke(struct bGPDframe *gpf); @@ -79,7 +82,6 @@ void gpencil_delete_menu(void); void gpencil_convert_operation(short mode); void gpencil_convert_menu(void); -//short gpencil_paint(short mousebutton); short gpencil_do_paint(struct ScrArea *sa, short mousebutton); #endif /* BDR_GPENCIL_H */ diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h index 1425cf6a67c..ae330b30d81 100644 --- a/source/blender/include/BIF_editaction.h +++ b/source/blender/include/BIF_editaction.h @@ -201,6 +201,10 @@ void delete_gpencil_layers(void); void delete_gplayer_frames(struct bGPDlayer *gpl); void duplicate_gplayer_frames(struct bGPDlayer *gpd); +void free_gpcopybuf(void); +void copy_gpdata(void); +void paste_gpdata(void); + void snap_gplayer_frames(struct bGPDlayer *gpl, short mode); void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode); diff --git a/source/blender/include/BSE_seqaudio.h b/source/blender/include/BSE_seqaudio.h index 9b2c21a0817..64aa50c661d 100644 --- a/source/blender/include/BSE_seqaudio.h +++ b/source/blender/include/BSE_seqaudio.h @@ -29,20 +29,24 @@ #ifndef BSE_SEQAUDIO_H #define BSE_SEQAUDIO_H +#ifndef DISABLE_SDL #include "SDL.h" +#endif + /* muha, we don't init (no SDL_main)! */ #ifdef main # undef main #endif #include "DNA_sound_types.h" +#include "BLO_sys_types.h" void audio_mixdown(); void audio_makestream(bSound *sound); -void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown); -void audiostream_fill(Uint8* mixdown, int len); -void audiostream_start(Uint32 frame); -void audiostream_scrub(Uint32 frame); +void audiostream_play(uint32_t startframe, uint32_t duration, int mixdown); +void audiostream_fill(uint8_t* mixdown, int len); +void audiostream_start(uint32_t frame); +void audiostream_scrub(uint32_t frame); void audiostream_stop(void); int audiostream_pos(void); |