[Bf-blender-cvs] [7dee53c] alembic: Have to use IDP_ReplaceInGroup to overwrite ID properties that already exist.

Lukas Tönne noreply at git.blender.org
Wed Jun 3 10:45:52 CEST 2015


Commit: 7dee53c6df4e0896e9bb4e61cae7ba89a550aef1
Author: Lukas Tönne
Date:   Wed Jun 3 10:44:48 2015 +0200
Branches: alembic
https://developer.blender.org/rB7dee53c6df4e0896e9bb4e61cae7ba89a550aef1

Have to use IDP_ReplaceInGroup to overwrite ID properties that already
exist.

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

M	source/blender/pointcache/alembic/abc_info.cpp

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

diff --git a/source/blender/pointcache/alembic/abc_info.cpp b/source/blender/pointcache/alembic/abc_info.cpp
index be2f6a1..327542c 100644
--- a/source/blender/pointcache/alembic/abc_info.cpp
+++ b/source/blender/pointcache/alembic/abc_info.cpp
@@ -151,24 +151,24 @@ void abc_metadata_to_idprops_group(const MetaData &md, IDProperty *prop)
 		if (key[0] == 'i') {
 			std::istringstream ss(value);
 			if (ss >> val.i) {
-				IDP_AddToGroup(prop, IDP_New(IDP_INT, &val, key.c_str()+1));
+				IDP_ReplaceInGroup(prop, IDP_New(IDP_INT, &val, key.c_str()+1));
 			}
 		}
 		else if (key[0] == 'f') {
 			std::istringstream ss(value);
 			if (ss >> val.f) {
-				IDP_AddToGroup(prop, IDP_New(IDP_FLOAT, &val, key.c_str()+1));
+				IDP_ReplaceInGroup(prop, IDP_New(IDP_FLOAT, &val, key.c_str()+1));
 			}
 		}
 		else if (key[0] == 's') {
 			val.string.str = value.c_str();
 			val.string.len = value.length();
-			IDP_AddToGroup(prop, IDP_New(IDP_STRING, &val, key.c_str()+1));
+			IDP_ReplaceInGroup(prop, IDP_New(IDP_STRING, &val, key.c_str()+1));
 		}
 		else {
 			val.string.str = value.c_str();
 			val.string.len = value.length();
-			IDP_AddToGroup(prop, IDP_New(IDP_STRING, &val, key.c_str()));
+			IDP_ReplaceInGroup(prop, IDP_New(IDP_STRING, &val, key.c_str()));
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list