diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-08 12:53:14 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-08 12:53:14 +0300 |
| commit | d6d4d5e094eae31b33c844c3d4f9602e6377de4b (patch) | |
| tree | 277ee63994d64b001c4c96ea90750a15f44cb2d2 /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | a18e5d6a67b9fe56f6ca9840d346e173a6b4301a (diff) | |
Fix multiview issue: play animation crashes
We need to avoid passing a NULL string here, and also we need to pass
the correct suffix we used to pass view string directly which is
probably not what we want.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 0d70b6f3ba8..02364d9b3a9 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -121,8 +121,14 @@ static void rna_Scene_update_tagged(Scene *scene) static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, int preview, const char *view, char *name) { + const char *suffix = BKE_scene_multiview_view_suffix_get(rd, view); + + /* avoid NULL pointer */ + if (!suffix) + suffix = ""; + if (BKE_imtype_is_movie(rd->im_format.imtype)) { - BKE_movie_filepath_get(name, rd, preview != 0, view); + BKE_movie_filepath_get(name, rd, preview != 0, suffix); } else { BKE_image_path_from_imformat( |