diff options
author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-12-02 17:39:49 +0300 |
---|---|---|
committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-12-02 17:39:49 +0300 |
commit | a219c93cb0415962ce09930a6475286bc4a18453 (patch) | |
tree | 090db3754cfcd88b14e31c0abd3527b25b22bac8 /source/blender/editors/render | |
parent | d56324b254ce689bf1d983696c2d4e4af1ea6604 (diff) |
Quicktime(Carbon/win32) : add operator to raise the "compression settings" quicktime standard dialog
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/SConscript | 10 | ||||
-rw-r--r-- | source/blender/editors/render/render_ops.c | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index b1b1165a1fe..575f988544c 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -16,4 +16,12 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45] ) + +if env['WITH_BF_QUICKTIME']: + incs += ' ../../quicktime' + env.Append(CFLAGS=['-DWITH_QUICKTIME']) + +if env['USE_QTKIT']: + env.Append(CFLAGS=['-DUSE_QTKIT']) + +env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45]) diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index 8c0c1b18fca..3e1643fab7b 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -34,6 +34,10 @@ #include "render_intern.h" // own include +#if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT)) +#include "quicktime_export.h" +#endif + /***************************** render ***********************************/ void ED_operatortypes_render(void) @@ -52,6 +56,10 @@ void ED_operatortypes_render(void) WM_operatortype_append(SCENE_OT_render_layer_add); WM_operatortype_append(SCENE_OT_render_layer_remove); +#if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT)) + WM_operatortype_append(SCENE_OT_render_data_set_quicktime_codec); +#endif + WM_operatortype_append(TEXTURE_OT_slot_move); } |