diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 22:41:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 22:41:30 +0400 |
| commit | dc68210c7e432cf313721541e639426dd94f2dfb (patch) | |
| tree | 4fb676fa675c304d6594264cc9c1417967d15ff5 /source/blender/collada/MeshImporter.cpp | |
| parent | 51488283564273c5e796d5ca3ded47f2726330e8 (diff) | |
| parent | d6deca4e9d6bc7faff98644286571c7934324a9d (diff) | |
misc changes from trunk (avoid confusion since these were not intentional differences)bmesh
Diffstat (limited to 'source/blender/collada/MeshImporter.cpp')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 26ec7be1002..ebfeb0c6301 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -746,6 +746,9 @@ MTex *MeshImporter::assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBindi const CustomData *data = &me->fdata; int layer_index = CustomData_get_layer_index(data, CD_MTFACE); + + if(layer_index == -1) return NULL; + CustomDataLayer *cdl = &data->layers[layer_index+setindex]; /* set uvname to bind_vertex_input semantic */ |