[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20605] branches/soc-2009-yukishiro/source /blender: free light paint in scene and write its data in writefile

[Jingyuan Huang]

Revision: 20605
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20605
Author:   yukishiro
Date:     2009-06-03 19:00:56 +0200 (Wed, 03 Jun 2009)

Log Message:
-----------
free light paint in scene and write its data in writefile

Modified Paths:
--------------
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c	2009-06-03 15:24:42 UTC (rev 20604)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c	2009-06-03 17:00:56 UTC (rev 20605)
@@ -177,6 +177,8 @@
 			MEM_freeN(sce->toolsettings->vpaint);
 		if(sce->toolsettings->wpaint)
 			MEM_freeN(sce->toolsettings->wpaint);
+		if(sce->toolsettings->lpaint)
+			MEM_freeN(sce->toolsettings->lpaint);
 		if(sce->toolsettings->sculpt) {
 			sculptsession_free(sce->toolsettings->sculpt);
 			MEM_freeN(sce->toolsettings->sculpt);
@@ -723,4 +725,4 @@
 			scene->r.dometext = NULL;
 		scene = scene->id.next;
 	}
-}
\ No newline at end of file
+}

Modified: branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c	2009-06-03 15:24:42 UTC (rev 20604)
+++ branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c	2009-06-03 17:00:56 UTC (rev 20605)
@@ -1587,9 +1587,11 @@
 		writestruct(wd, DATA, "Radio", 1, sce->radio);
 		writestruct(wd, DATA, "ToolSettings", 1, sce->toolsettings);
 		if(sce->toolsettings->vpaint)
-			writestruct(wd, DATA, "VPaint", 1, sce->toolsettings->vpaint);
+			writestruct(wd, DATA, "Vertex VPaint", 1, sce->toolsettings->vpaint);
 		if(sce->toolsettings->wpaint)
-			writestruct(wd, DATA, "VPaint", 1, sce->toolsettings->wpaint);
+			writestruct(wd, DATA, "Weight VPaint", 1, sce->toolsettings->wpaint);
+		if(sce->toolsettings->lpaint)
+			writestruct(wd, DATA, "Light VPaint", 1, sce->toolsettings->wpaint);
 		if(sce->toolsettings->sculpt)
 			writestruct(wd, DATA, "Sculpt", 1, sce->toolsettings->sculpt);
 

Modified: branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c	2009-06-03 15:24:42 UTC (rev 20604)
+++ branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c	2009-06-03 17:00:56 UTC (rev 20605)
@@ -202,7 +202,7 @@
 
 static VPaint *new_lpaint()
 {
-	VPaint *lp= MEM_callocN(sizeof(VPaint), "VPaint");
+	VPaint *lp= MEM_callocN(sizeof(VPaint), "Light VPaint");
 	
 	lp->gamma= lp->mul= 1.0f;
 	lp->flag= VP_AREA+VP_SOFT+VP_SPRAY; //TODO: not sure how to use flag for light brush

Modified: branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c	2009-06-03 15:24:42 UTC (rev 20604)
+++ branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c	2009-06-03 17:00:56 UTC (rev 20605)
@@ -178,7 +178,7 @@
 
 static VPaint *new_vpaint(int wpaint)
 {
-	VPaint *vp= MEM_callocN(sizeof(VPaint), "VPaint");
+	VPaint *vp= MEM_callocN(sizeof(VPaint), "Vertex/Weight VPaint");
 	
 	vp->gamma= vp->mul= 1.0f;