Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2017-05-24 21:13:45 +0300
committerAntonio Vazquez <blendergit@gmail.com>2017-05-24 21:13:45 +0300
commitaec76fdcc64a5fa6238ff25df0907e3f722eeec6 (patch)
treeab0595e38c2e1f3c7018ad7664f60496b2d521c3 /source/blender/collada
parent214c42157a2d4e64c599adb6d2c0c47a0ebb7bb2 (diff)
Fix compiler error for VS2017
a void function cannot return a value.
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/MeshImporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index aec08c591b5..9bd74a8f52f 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1065,7 +1065,7 @@ void MeshImporter::assign_material_to_geom(
if (uid_material_map.find(ma_uid) == uid_material_map.end()) {
fprintf(stderr, "Cannot find material by UID.\n");
- return NULL;
+ return;
}
// first time we get geom_uid, ma_uid pair. Save for later check.