[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30451] branches/soc-2010-jwilkins/source/ blender/blenkernel/intern/brush.c: * was not maintaining the user count for the image icon when a brush is copied or deleted

[Jason Wilkins]

Revision: 30451
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30451
Author:   jwilkins
Date:     2010-07-17 23:38:23 +0200 (Sat, 17 Jul 2010)

Log Message:
-----------
* was not maintaining the user count for the image icon when a brush is copied or deleted

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-17 21:11:04 UTC (rev 30450)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-17 21:38:23 UTC (rev 30451)
@@ -130,8 +130,12 @@
 	
 	brushn= copy_libblock(brush);
 
-	if(brush->mtex.tex) id_us_plus((ID*)brush->mtex.tex);
+	if(brush->mtex.tex)
+		id_us_plus((ID*)brush->mtex.tex);
 	
+	if(brush->image_icon)
+		id_us_plus((ID*)brush->image_icon);
+
 	brushn->curve= curvemapping_copy(brush->curve);
 
 	/* enable fake user by default */
@@ -139,15 +143,19 @@
 		brushn->id.flag |= LIB_FAKEUSER;
 		brush_toggled_fake_user(brushn);
 	}
-	
+
 	return brushn;
 }
 
 /* not brush itself */
 void free_brush(Brush *brush)
 {
-	if(brush->mtex.tex) brush->mtex.tex->id.us--;
+	if(brush->mtex.tex)
+		brush->mtex.tex->id.us--;
 
+	if (brush->image_icon)
+		brush->image_icon->id.us--;
+
 	curvemapping_free(brush->curve);
 }
 
@@ -303,6 +311,9 @@
 	if(brush->mtex.tex)
 		brush->mtex.tex->id.us--;
 
+	if(brush->image_icon)
+		brush->image_icon->id.us--;
+
 	return 1;
 }