diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-11 21:28:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-11 21:28:00 +0300 |
| commit | 44f94f7927a2becf40e50a105b4c18f0a36f5341 (patch) | |
| tree | d08fec6c4f5d5d648a3dd31f46421bfa7cff61b5 | |
| parent | 4a4b0732e5d1bc71dde53934a4e74dc782beee1c (diff) | |
* Compile fix for RNA + makefiles.
* Fix for bug in collection string lookup function.
| -rw-r--r-- | source/blender/makesrna/intern/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile index 475e3944397..0a1f10ed713 100644 --- a/source/blender/makesrna/intern/Makefile +++ b/source/blender/makesrna/intern/Makefile @@ -61,7 +61,7 @@ clean:: # is done quite intentionally. If there is a bug in that lib, it needs # to be fixed by the module maintainer. -RNAOBJS = $(filter-out %RNA.o, $(OBJS)) +RNAOBJS = $(filter-out %rna_dependency.o, $(filter-out %rna_access.o, $(filter-out %RNA.o, $(OBJS)))) $(DIR)/$(DEBUG_DIR)makesrna: $(RNAOBJS) $(DIR)/$(DEBUG_DIR)makesrna.o $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a $(CC) $(LDFLAGS) -o $@ $(WINLIBS) $^ diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 05aafa81626..553875c8158 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -27,14 +27,14 @@ #include "MEM_guardedalloc.h" +#include "BLI_blenlib.h" +#include "BLI_dynstr.h" + #include "RNA_access.h" #include "RNA_types.h" #include "rna_internal.h" -#include "BLI_blenlib.h" -#include "BLI_dynstr.h" - /* Pointer */ void RNA_pointer_main_get(struct Main *main, struct PointerRNA *r_ptr) @@ -374,7 +374,7 @@ int RNA_property_collection_lookup_string(PropertyRNA *prop, PointerRNA *ptr, co else { /* no callback defined, compare with name properties if they exist */ CollectionPropertyIterator iter; - PropertyRNA *prop; + PropertyRNA *nameprop; PointerRNA iterptr; char name[256], *nameptr; int length, alloc, found= 0; @@ -384,9 +384,9 @@ int RNA_property_collection_lookup_string(PropertyRNA *prop, PointerRNA *ptr, co RNA_property_collection_get(prop, &iter, &iterptr); if(iterptr.data && iterptr.type->nameproperty) { - prop= iterptr.type->nameproperty; + nameprop= iterptr.type->nameproperty; - length= RNA_property_string_length(prop, &iterptr); + length= RNA_property_string_length(nameprop, &iterptr); if(sizeof(name)-1 < length) { nameptr= name; @@ -397,7 +397,7 @@ int RNA_property_collection_lookup_string(PropertyRNA *prop, PointerRNA *ptr, co alloc= 1; } - RNA_property_string_get(prop, &iterptr, nameptr); + RNA_property_string_get(nameprop, &iterptr, nameptr); if(strcmp(nameptr, key) == 0) { *r_ptr= iterptr; |