Revision: 17410 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17410 Author: blendix Date: 2008-11-11 19:28:00 +0100 (Tue, 11 Nov 2008)
Log Message: ----------- * Compile fix for RNA + makefiles. * Fix for bug in collection string lookup function. Modified Paths: -------------- branches/blender2.5/blender/source/blender/makesrna/intern/Makefile branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c Modified: branches/blender2.5/blender/source/blender/makesrna/intern/Makefile =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/intern/Makefile 2008-11-11 16:48:34 UTC (rev 17409) +++ branches/blender2.5/blender/source/blender/makesrna/intern/Makefile 2008-11-11 18:28:00 UTC (rev 17410) @@ -61,7 +61,7 @@ # 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) $^ Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c 2008-11-11 16:48:34 UTC (rev 17409) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c 2008-11-11 18:28:00 UTC (rev 17410) @@ -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 @@ 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 @@ 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 @@ alloc= 1; } - RNA_property_string_get(prop, &iterptr, nameptr); + RNA_property_string_get(nameprop, &iterptr, nameptr); if(strcmp(nameptr, key) == 0) { *r_ptr= iterptr; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs