[Bf-blender-cvs] [7c5c7b5] master: Fix T45537: cycles bake crashes with motionblur on

[Kévin Dietrich]

Commit: 7c5c7b5ef6c3a77411b9e197152d5754943a034d
Author: Kévin Dietrich
Date:   Fri Jul 24 21:18:17 2015 +0200
Branches: master
https://developer.blender.org/rB7c5c7b5ef6c3a77411b9e197152d5754943a034d

Fix T45537: cycles bake crashes with motionblur on

The crash was due to baking with motion blur but without a camera.

Reviewed by Brecht.

===================================================================

M	intern/cycles/blender/blender_camera.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 18e9aa8..0a79bfb 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -462,6 +462,9 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings b_render,
                                      int width, int height,
                                      float motion_time)
 {
+	if(!b_ob)
+		return;
+
 	Camera *cam = scene->camera;
 	BL::Array<float, 16> b_ob_matrix;
 	b_engine.camera_model_matrix(b_ob, b_ob_matrix);