[Bf-blender-cvs] [0e2f6c7] master: Fix T39833: Nurbs Crash

[Bastien Montagne]

Commit: 0e2f6c7fc4db06b8fa9be758e294a3376c32bc5d
Author: Bastien Montagne
Date:   Mon Apr 21 23:41:39 2014 +0200
https://developer.blender.org/rB0e2f6c7fc4db06b8fa9be758e294a3376c32bc5d

Fix T39833: Nurbs Crash

Converting empty object to mesh can generate a 'Null' BL:Mesh, we have to check against it.

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

M	intern/cycles/blender/blender_util.h

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

diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index b2046b2..2c83ee6 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -43,10 +43,12 @@ void python_thread_state_restore(void **python_thread_state);
 static inline BL::Mesh object_to_mesh(BL::BlendData data, BL::Object object, BL::Scene scene, bool apply_modifiers, bool render, bool calc_undeformed)
 {
 	BL::Mesh me = data.meshes.new_from_object(scene, object, apply_modifiers, (render)? 2: 1, false, calc_undeformed);
-	if (me.use_auto_smooth()) {
-		me.calc_normals_split(me.auto_smooth_angle());
+	if ((bool)me) {
+		if (me.use_auto_smooth()) {
+			me.calc_normals_split(me.auto_smooth_angle());
+		}
+		me.calc_tessface();
 	}
-	me.calc_tessface();
 	return me;
 }