diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-14 00:47:29 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-14 00:47:29 +0400 |
commit | 0fbff1be3ee74f687d46650f546de8d09b3123fd (patch) | |
tree | 70bdc7045d43cb9a94f4ef38b551daf369cf4931 /source/blender/makesrna/intern | |
parent | 62fa555b8e73fd72f353ad25acc505c7d8c729b0 (diff) |
Fix quicktime export being broken in various ways: callback was missing
parameter, codec RNA wrapping was wrong, and there was a python script error.
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1060c1b52ac..f797368ac13 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -821,16 +821,16 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str) #ifdef WITH_QUICKTIME static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - return quicktime_rnatmpvalue_from_videocodectype(rd->qtcodecsettings.codecType); + return quicktime_rnatmpvalue_from_videocodectype(settings->codecType); } static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - rd->qtcodecsettings.codecType = quicktime_videocodecType_from_rnatmpvalue(value); + settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value); } static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr, @@ -863,16 +863,16 @@ static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bCon #ifdef USE_QTKIT static int rna_RenderSettings_qtcodecsettings_audiocodecType_get(PointerRNA *ptr) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - return quicktime_rnatmpvalue_from_audiocodectype(rd->qtcodecsettings.audiocodecType); + return quicktime_rnatmpvalue_from_audiocodectype(settings->audiocodecType); } static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *ptr, int value) { - RenderData *rd= (RenderData*)ptr->data; + QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data; - rd->qtcodecsettings.audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value); + settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value); } static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr, |