[Bf-blender-cvs] [5a8d7af] master: Fix T40074: Autosmooth option causes assert failure when selected.

Bastien Montagne noreply at git.blender.org
Thu May 8 17:57:40 CEST 2014


Commit: 5a8d7af642d8770cfc8e3b120f7de021efa1cbb9
Author: Bastien Montagne
Date:   Thu May 8 17:48:00 2014 +0200
https://developer.blender.org/rB5a8d7af642d8770cfc8e3b120f7de021efa1cbb9

Fix T40074: Autosmooth option causes assert failure when selected.

No need to call `dm_ensure_display_normals()` when using loop normals,
poly/vert ones have already been computed!

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

M	source/blender/blenkernel/intern/DerivedMesh.c

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 8ffa618..72e39fb 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1884,8 +1884,11 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		 * which deals with drawing differently.
 		 *
 		 * Only calc vertex normals if they are flagged as dirty.
+		 * If using loop normals, poly nors have already been computed.
 		 */
-		dm_ensure_display_normals(finaldm);
+		if (!do_loop_normals) {
+			dm_ensure_display_normals(finaldm);
+		}
 	}
 
 #ifdef WITH_GAMEENGINE




More information about the Bf-blender-cvs mailing list