[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19301] branches/blender2.5/blender/source /blender/makesrna/intern: RNA:

[Brecht Van Lommel]

Revision: 19301
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19301
Author:   blendix
Date:     2009-03-15 12:30:02 +0100 (Sun, 15 Mar 2009)

Log Message:
-----------
RNA:
* Fix a dependency issue in Makefiles.
* Fix use of uninitialized variable in makesrna.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
    branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/Makefile	2009-03-15 10:43:17 UTC (rev 19300)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/Makefile	2009-03-15 11:30:02 UTC (rev 19301)
@@ -38,6 +38,10 @@
 
 include nan_compile.mk
 
+ifdef NAN_DEPEND
+-include $(MAKESRCS:%.c=$(DIR)/$(DEBUG_DIR)%.d)
+endif
+
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2009-03-15 10:43:17 UTC (rev 19300)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2009-03-15 11:30:02 UTC (rev 19301)
@@ -1684,7 +1684,6 @@
 
 		fprintf(f, "/**************** %s ****************/\n\n", srna->name);
 
-		srna= ds->srna;
 		fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base)? srna->base->identifier: "Pointer");
 		fprintf(f, "public:\n");
 		fprintf(f, "\t%s(const PointerRNA& ptr) :\n\t\t%s(ptr)", srna->identifier, (srna->base)? srna->base->identifier: "Pointer");
@@ -1747,6 +1746,8 @@
 	strcpy(deffile, outfile);
 	strcat(deffile, "RNA_blender_cpp.h");
 
+	status= (DefRNA.error != 0);
+
 	if(status) {
 		make_bad_file(deffile);
 	}
@@ -1765,11 +1766,8 @@
 		}
 	}
 
-
 	rna_sort(brna);
 
-	status= (DefRNA.error != 0);
-
 	/* create rna_gen_*.c files */
 	for(i=0; PROCESS_ITEMS[i].filename; i++) {
 		strcpy(deffile, outfile);