[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17444] branches/etch-a-ton/source/blender : Fix saving and loading of the template variable ( it incorrectedly counted as a user).

[Martin Poirier]

Revision: 17444
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17444
Author:   theeth
Date:     2008-11-13 19:57:10 +0100 (Thu, 13 Nov 2008)

Log Message:
-----------
Fix saving and loading of the template variable (it incorrectedly counted as a user).

Modified Paths:
--------------
    branches/etch-a-ton/source/blender/blenkernel/intern/object.c
    branches/etch-a-ton/source/blender/blenloader/intern/readfile.c

Modified: branches/etch-a-ton/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/etch-a-ton/source/blender/blenkernel/intern/object.c	2008-11-13 13:34:43 UTC (rev 17443)
+++ branches/etch-a-ton/source/blender/blenkernel/intern/object.c	2008-11-13 18:57:10 UTC (rev 17444)
@@ -521,6 +521,7 @@
 	while(sce) {
 		if(sce->id.lib==NULL) {
 			if(sce->camera==ob) sce->camera= NULL;
+			if(sce->toolsettings->skgen_template==ob) sce->toolsettings->skgen_template = NULL;
 		}
 		sce= sce->id.next;
 	}

Modified: branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/etch-a-ton/source/blender/blenloader/intern/readfile.c	2008-11-13 13:34:43 UTC (rev 17443)
+++ branches/etch-a-ton/source/blender/blenloader/intern/readfile.c	2008-11-13 18:57:10 UTC (rev 17444)
@@ -3460,7 +3460,7 @@
 				newlibadr_us(fd, sce->id.lib, sce->toolsettings->imapaint.brush);
 
 	
-			sce->toolsettings->skgen_template = newlibadr_us(fd, sce->id.lib, sce->toolsettings->skgen_template);
+			sce->toolsettings->skgen_template = newlibadr(fd, sce->id.lib, sce->toolsettings->skgen_template);
 
 			/* Sculptdata textures */
 			for(a=0; a<MAX_MTEX; ++a) {