[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24279] trunk/blender/source/blender/ makesrna/intern: error in last commit ( wasnt writing NULL when no active property exists)

[Campbell Barton]

Revision: 24279
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24279
Author:   campbellbarton
Date:     2009-11-03 18:00:38 +0100 (Tue, 03 Nov 2009)

Log Message:
-----------
error in last commit (wasnt writing NULL when no active property exists)
added id.tag so you can tag any library data - materials, meshes etc

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c	2009-11-03 16:55:59 UTC (rev 24278)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c	2009-11-03 17:00:38 UTC (rev 24279)
@@ -1834,9 +1834,8 @@
 				else fprintf(f, "NULL, ");
 				if(cprop->remove) fprintf(f, "&rna_%s_%s_func, ", srna->identifier, (char*)cprop->remove);
 				else fprintf(f, "NULL, ");
-
 				if(cprop->active) fprintf(f, "(PropertyRNA*)&rna_%s%s_%s, ", srna->identifier, strnest, cprop->active->identifier);
-
+				else fprintf(f, "NULL, ");
 				if(cprop->type) fprintf(f, "&RNA_%s\n", (char*)cprop->type);
 				else fprintf(f, "NULL\n");
 				break;

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-11-03 16:55:59 UTC (rev 24278)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-11-03 17:00:38 UTC (rev 24279)
@@ -312,6 +312,10 @@
 	RNA_def_property_ui_text(prop, "Fake User", "Saves this datablock even if it has no users");
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_fake_user_set");
 
+	prop= RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_DOIT);
+	RNA_def_property_ui_text(prop, "Tag", "Tools can use this to tag data, (initial state is undefined).");
+
 	prop= RNA_def_property(srna, "library", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "lib");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);