[Bf-blender-cvs] [8bb318b] master: Fix T41528: Error message on trying to import COLLADA triangle strips is wrong

Thomas Dinges noreply at git.blender.org
Fri Aug 22 02:48:37 CEST 2014


Commit: 8bb318bf90ad564f2e875249b46a8307f73db9f0
Author: Thomas Dinges
Date:   Fri Aug 22 02:46:29 2014 +0200
Branches: master
https://developer.blender.org/rB8bb318bf90ad564f2e875249b46a8307f73db9f0

Fix T41528: Error message on trying to import COLLADA triangle strips is wrong

Thanks to Maarten Gribnau for the patch.

===================================================================

M	source/blender/collada/MeshImporter.cpp

===================================================================

diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 211c34e..a4bf1d2 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -84,7 +84,7 @@ static const char *bc_primTypeToStr(COLLADAFW::MeshPrimitive::PrimitiveType type
 		case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
 			return "TRIANGLE_FANS";
 		case COLLADAFW::MeshPrimitive::TRIANGLE_STRIPS:
-			return "TRIANGLE_FANS";
+			return "TRIANGLE_STRIPS";
 		case COLLADAFW::MeshPrimitive::POINTS:
 			return "POINTS";
 		case COLLADAFW::MeshPrimitive::UNDEFINED_PRIMITIVE_TYPE:




More information about the Bf-blender-cvs mailing list