diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-26 01:31:19 +0400 |
| commit | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (patch) | |
| tree | 2cc12476fb3fa653042eef99fa6b5d4d8cb290ec /source/blender/makesrna/intern/rna_scene.c | |
| parent | 4ced91da47ec1e95d71beef07b218fd0290ff68a (diff) | |
| parent | 02d72b5c076f4ae1b47da74fe7a60a916edad9f2 (diff) | |
svn merge ^/trunk/blender -r42839:42871
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 51239cd55b1..c618912f4b5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -661,10 +661,10 @@ static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) Scene *scene= ptr->id.data; RenderData *rd= &scene->r; #ifdef WITH_FFMPEG - ffmpeg_verify_image_type(rd); + ffmpeg_verify_image_type(rd, imf); #endif #ifdef WITH_QUICKTIME - quicktime_verify_image_type(rd); + quicktime_verify_image_type(rd, imf); #endif (void)rd; } |