diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-11-06 05:45:15 +0400 |
| commit | 99c5e713970859640a9e46c2afeeff9d5235f624 (patch) | |
| tree | dd9a6ba6d4cb49a6db9f2ddf3d6552ea5496f3e4 /source/blender/editors | |
| parent | 299812f28d32950a9bbf4612a3a5fef46054e7fb (diff) | |
Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.
The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/render/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/editors/render/render_ops.c | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 0a390da2ae4..9dd686326bb 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1617,6 +1617,9 @@ static int convert_exec(bContext *C, wmOperator *op) for (nu = cu->nurb.first; nu; nu = nu->next) nu->charidx = 0; + cu->flag &= ~CU_3D; + BKE_curve_curve_dimension_update(cu); + if (target == OB_MESH) { curvetomesh(scene, newob); diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index 7406d42f416..41576f9b485 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -61,9 +61,6 @@ if env['WITH_BF_QUICKTIME']: incs += ' ../../quicktime' env.Append(CFLAGS=['-DWITH_QUICKTIME']) -if env['USE_QTKIT']: - env.Append(CFLAGS=['-DUSE_QTKIT']) - if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index 7c52b7d0d39..3401577ee55 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -37,10 +37,6 @@ #include "render_intern.h" // own include -#if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT)) -#include "quicktime_export.h" -#endif - /***************************** render ***********************************/ void ED_operatortypes_render(void) @@ -81,10 +77,6 @@ void ED_operatortypes_render(void) WM_operatortype_append(SCENE_OT_freestyle_modifier_copy); #endif -#if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT)) - WM_operatortype_append(SCENE_OT_render_data_set_quicktime_codec); -#endif - WM_operatortype_append(TEXTURE_OT_slot_copy); WM_operatortype_append(TEXTURE_OT_slot_paste); WM_operatortype_append(TEXTURE_OT_slot_move); |