[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48135] branches/soc-2012-bratwurst/source /blender: Texture paint mask textures

[Antony Riakiotakis]

Revision: 48135
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48135
Author:   psy-fi
Date:     2012-06-20 17:52:09 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Texture paint mask textures
============================
* Add initialization and file save/load code

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c

Modified: branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c	2012-06-20 17:37:37 UTC (rev 48134)
+++ branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c	2012-06-20 17:52:09 UTC (rev 48135)
@@ -151,6 +151,9 @@
 	if (brush->mtex.tex)
 		id_us_plus((ID *)brush->mtex.tex);
 
+	if (brush->alphamtex.tex)
+		id_us_plus((ID *)brush->alphamtex.tex);
+
 	if (brush->icon_imbuf)
 		brushn->icon_imbuf = IMB_dupImBuf(brush->icon_imbuf);
 
@@ -173,6 +176,9 @@
 	if (brush->mtex.tex)
 		brush->mtex.tex->id.us--;
 
+	if (brush->alphamtex.tex)
+		brush->alphamtex.tex->id.us--;
+
 	if (brush->icon_imbuf)
 		IMB_freeImBuf(brush->icon_imbuf);
 
@@ -184,6 +190,7 @@
 static void extern_local_brush(Brush *brush)
 {
 	id_lib_extern((ID *)brush->mtex.tex);
+	id_lib_extern((ID *)brush->alphamtex.tex);
 	id_lib_extern((ID *)brush->clone.image);
 }
 

Modified: branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c	2012-06-20 17:37:37 UTC (rev 48134)
+++ branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c	2012-06-20 17:52:09 UTC (rev 48135)
@@ -1671,6 +1671,7 @@
 			brush->id.flag -= LIB_NEEDLINK;
 			
 			brush->mtex.tex = newlibadr_us(fd, brush->id.lib, brush->mtex.tex);
+			brush->alphamtex.tex = newlibadr_us(fd, brush->id.lib, brush->alphamtex.tex);
 			brush->clone.image = newlibadr_us(fd, brush->id.lib, brush->clone.image);
 		}
 	}

Modified: branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c	2012-06-20 17:37:37 UTC (rev 48134)
+++ branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c	2012-06-20 17:52:09 UTC (rev 48135)
@@ -2675,6 +2675,7 @@
 			if (brush->id.properties) IDP_WriteProperty(brush->id.properties, wd);
 			
 			writestruct(wd, DATA, "MTex", 1, &brush->mtex);
+			writestruct(wd, DATA, "MTex", 1, &brush->alphamtex);
 			
 			if (brush->curve)
 				write_curvemapping(wd, brush->curve);