archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

T38763 Fix: avoid NPE When no custom properties are defined

Browse Source
This commit is contained in:
Gaia Clary
2014-02-23 15:32:49 +01:00
parent cb1b6b549e
commit d92f6b9903
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/collada/ControllerExporter.cpp
View File

@@ -469,26 +469,25 @@ std::string ControllerExporter::add_joints_source(Object *ob_arm, ListBase *defb
static float get_property(Bone *bone, const char *key, float def)
{
float result;
IDProperty *property = IDP_GetPropertyFromGroup(bone->prop, 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;
float result = def;
if (bone->prop) {
IDProperty *property = IDP_GetPropertyFromGroup(bone->prop, 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;
}
}
}
else {
result = def;
}
return result;
}