[Bf-blender-cvs] [aec76fdcc64] blender2.8: Fix compiler error for VS2017
Antonio Vazquez
noreply at git.blender.org
Wed May 24 20:14:23 CEST 2017
Commit: aec76fdcc64a5fa6238ff25df0907e3f722eeec6
Author: Antonio Vazquez
Date: Wed May 24 20:13:45 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBaec76fdcc64a5fa6238ff25df0907e3f722eeec6
Fix compiler error for VS2017
a void function cannot return a value.
===================================================================
M source/blender/collada/MeshImporter.cpp
===================================================================
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.
More information about the Bf-blender-cvs
mailing list