[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57601] trunk/blender/source/blender/ blenkernel/intern/displist.c: Fix crash in when dding subsurf modifier to curves

[Sergey Sharybin]

Revision: 57601
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57601
Author:   nazgul
Date:     2013-06-20 11:00:35 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
Fix crash in when dding subsurf modifier to curves

Issue was caused by svn rev57566 which didn't take into
account the fact that curves could have dm of type CCGDM
and in this case CDDM_calc_normals_mapping_ex would fail
dramatically.

Added a check around normals update call bout whether
DM is CDDM or not. The same happens in mesh's modifier
stack.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57566

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2013-06-20 09:11:29 UTC (rev 57600)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2013-06-20 11:00:35 UTC (rev 57601)
@@ -1040,7 +1040,9 @@
 				DM_update_tessface_data(dm);
 			}
 
-			CDDM_calc_normals_mapping_ex(dm, (dm->dirty & DM_DIRTY_NORMALS) ? false : true);
+			if (dm->type == DM_TYPE_CDDM) {
+				CDDM_calc_normals_mapping_ex(dm, (dm->dirty & DM_DIRTY_NORMALS) ? false : true);
+			}
 		}
 		(*derivedFinal) = dm;
 	}