Commit: d6d4d5e094eae31b33c844c3d4f9602e6377de4b
Author: Antony Riakiotakis
Date: Wed Apr 8 11:53:14 2015 +0200
Branches: master
https://developer.blender.org/rBd6d4d5e094eae31b33c844c3d4f9602e6377de4b
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.
===================================================================
M source/blender/makesrna/intern/rna_scene_api.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_scene_api.c
b/source/blender/makesrna/intern/rna_scene_api.c
index 0d70b6f..02364d9 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(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
