Merge branch 'master' into blender2.8

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 569e724b106..95897e32759 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -769,17 +769,17 @@ float bc_get_property(Bone *bone, std::string key, float def)
 	IDProperty *property = bc_get_IDProperty(bone, key);
 	if (property) {
 		switch (property->type) {
-		case IDP_INT:
-			result = (float)(IDP_Int(property));
-			break;
-		case IDP_FLOAT:
-			result = (float)(IDP_Float(property));
-			break;
-		case IDP_DOUBLE:
-			result = (float)(IDP_Double(property));
-			break;
-		default:
-			result = def;
+			case IDP_INT:
+				result = (float)(IDP_Int(property));
+				break;
+			case IDP_FLOAT:
+				result = (float)(IDP_Float(property));
+				break;
+			case IDP_DOUBLE:
+				result = (float)(IDP_Double(property));
+				break;
+			default:
+				result = def;
 		}
 	}
 	return result;