diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-22 01:41:39 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-22 01:41:39 +0400 |
| commit | 0e2f6c7fc4db06b8fa9be758e294a3376c32bc5d (patch) | |
| tree | 1d6ec3b99bfccc84a078719bc37728a3aa3aca1e /intern/cycles/blender/blender_util.h | |
| parent | 9b0ab890676790bb1e8e77797629b889ea66f69e (diff) | |
Fix T39833: Nurbs Crash
Converting empty object to mesh can generate a 'Null' BL:Mesh, we have to check against it.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index b2046b290b2..2c83ee6c2b5 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; } |