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

add IDP_EqualsProperties support for comparing non-null terminated byte strings.

Browse Source
This commit is contained in:
Campbell Barton
2011-11-15 10:32:08 +00:00
parent 4de917326b
commit 3cf56d46d1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/idprop.c
View File

@@ -40,8 +40,6 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#define BSTR_EQ(a, b) (*(a) == *(b) && !strcmp(a, b))
/* IDPropertyTemplate is a union in DNA_ID.h */ /* IDPropertyTemplate is a union in DNA_ID.h */
/*local size table.*/ /*local size table.*/
@@ -464,7 +462,7 @@ void IDP_ReplaceGroupInGroup(IDProperty *dest, IDProperty *src)
IDProperty *loop, *prop; IDProperty *loop, *prop;
for (prop=src->data.group.first; prop; prop=prop->next) { for (prop=src->data.group.first; prop; prop=prop->next) {
for (loop=dest->data.group.first; loop; loop=loop->next) { for (loop=dest->data.group.first; loop; loop=loop->next) {
if (BSTR_EQ(loop->name, prop->name)) { if (strcmp(loop->name, prop->name) == 0) {
IDProperty *copy = IDP_CopyProperty(prop); IDProperty *copy = IDP_CopyProperty(prop);
BLI_insertlink(&dest->data.group, loop, copy); BLI_insertlink(&dest->data.group, loop, copy);
@@ -635,7 +633,7 @@ int IDP_EqualsProperties(IDProperty *prop1, IDProperty *prop2)
else if(prop1->type == IDP_DOUBLE) else if(prop1->type == IDP_DOUBLE)
return (IDP_Double(prop1) == IDP_Double(prop2)); return (IDP_Double(prop1) == IDP_Double(prop2));
else if(prop1->type == IDP_STRING) else if(prop1->type == IDP_STRING)
return BSTR_EQ(IDP_String(prop1), IDP_String(prop2)); return ((prop1->len == prop2->len) && strncmp(IDP_String(prop1), IDP_String(prop2), prop1->len) == 0);
else if(prop1->type == IDP_ARRAY) { else if(prop1->type == IDP_ARRAY) {
if(prop1->len == prop2->len && prop1->subtype == prop2->subtype) if(prop1->len == prop2->len && prop1->subtype == prop2->subtype)
return memcmp(IDP_Array(prop1), IDP_Array(prop2), idp_size_table[(int)prop1->subtype]*prop1->len); return memcmp(IDP_Array(prop1), IDP_Array(prop2), idp_size_table[(int)prop1->subtype]*prop1->len);

2
source/blender/makesrna/intern/rna_access.c
View File

@@ -2336,7 +2336,7 @@ int RNA_property_string_length(PointerRNA *ptr, PropertyRNA *prop)
return idprop->len; return idprop->len;
} }
else { else {
return strlen(IDP_String(idprop)); return idprop->len - 1;
} }
} }
else if(sprop->length) else if(sprop->length)