[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14347] trunk/blender: fix for [#6342] Collada 1.4 import (of perhaps corrupt collada files) leads to a complete crash of Blender 2.43 under Windows XP

[Campbell Barton]

Revision: 14347
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14347
Author:   campbellbarton
Date:     2008-04-06 22:13:14 +0200 (Sun, 06 Apr 2008)

Log Message:
-----------
fix for [#6342] Collada 1.4 import (of perhaps corrupt collada files) leads to a complete crash of Blender 2.43 under Windows XP

NMesh wasnt checking 16max material limit, also made collada import work with the user scripts dir.

Modified Paths:
--------------
    trunk/blender/release/scripts/colladaImport14.py
    trunk/blender/source/blender/python/api2_2x/NMesh.c

Modified: trunk/blender/release/scripts/colladaImport14.py
===================================================================
--- trunk/blender/release/scripts/colladaImport14.py	2008-04-06 20:02:41 UTC (rev 14346)
+++ trunk/blender/release/scripts/colladaImport14.py	2008-04-06 20:13:14 UTC (rev 14347)
@@ -61,7 +61,7 @@
 
 try:
 	import colladaImEx.cstartup
-	if Blender.Get('scriptsdir') is None:
+	if Blender.Get('scriptsdir') is None and Blender.Get('uscriptsdir') is None:
 		if scriptsDir == '' or scriptsDir is None:
 			Blender.Draw.PupMenu("Cannot find folder %t | Please set path in file 'colladaImport14.py'")
 			error = True

Modified: trunk/blender/source/blender/python/api2_2x/NMesh.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/NMesh.c	2008-04-06 20:02:41 UTC (rev 14346)
+++ trunk/blender/source/blender/python/api2_2x/NMesh.c	2008-04-06 20:13:14 UTC (rev 14347)
@@ -2730,6 +2730,7 @@
 	}
 
 	if( len > 0 ) {
+		if (len>16) len = 16;
 		matlist = EXPP_newMaterialList_fromPyList( nmesh->materials );
 		EXPP_incr_mats_us( matlist, len );