diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-04-07 00:13:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-07 00:13:14 +0400 |
| commit | e4d25da6989fe361202efce9b371782aef809bac (patch) | |
| tree | 3e0f3d5e74fdc4c8bd470c76ed23fbfac953579b /source | |
| parent | 34771ef40519529e14d4a06cc318b63554ebbe58 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/api2_2x/NMesh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c index 4fb95ecd9eb..983f06ed2fc 100644 --- a/source/blender/python/api2_2x/NMesh.c +++ b/source/blender/python/api2_2x/NMesh.c @@ -2730,6 +2730,7 @@ Material **nmesh_updateMaterials( BPy_NMesh * nmesh ) } if( len > 0 ) { + if (len>16) len = 16; matlist = EXPP_newMaterialList_fromPyList( nmesh->materials ); EXPP_incr_mats_us( matlist, len ); |