[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26182] trunk/blender/source/blender: Fix [#20756] Texture painting on 3D tends to forget textures in the new texture menu.

[Matt Ebb]

Revision: 26182
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26182
Author:   broken
Date:     2010-01-22 05:21:46 +0100 (Fri, 22 Jan 2010)

Log Message:
-----------
Fix [#20756] Texture painting on 3D tends to forget textures in the new texture menu.

Part of this fix (loading files with brushes/textures) will only apply for new files saved after this commit

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2010-01-22 02:50:40 UTC (rev 26181)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2010-01-22 04:21:46 UTC (rev 26182)
@@ -43,7 +43,7 @@
 struct ReportList;
 
 #define BLENDER_VERSION			250
-#define BLENDER_SUBVERSION		11
+#define BLENDER_SUBVERSION		12
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2010-01-22 02:50:40 UTC (rev 26181)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2010-01-22 04:21:46 UTC (rev 26182)
@@ -89,6 +89,8 @@
 	brush->flag |= BRUSH_SPACE;
 
 	brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
+	
+	default_mtex(&brush->mtex);
 
 	/* enable fake user by default */
 	brush->id.flag |= LIB_FAKEUSER;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-01-22 02:50:40 UTC (rev 26181)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-01-22 04:21:46 UTC (rev 26182)
@@ -10373,9 +10373,8 @@
 		}
 	}
 
-	/* put 2.50 compatibility code here until next subversion bump */
-
-	if (1) {
+	if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 12))
+	{
 		Scene *sce;
 		Object *ob;
 		Brush *brush;
@@ -10475,6 +10474,12 @@
 		}
 		
 	}
+	
+	
+	/* put 2.50 compatibility code here until next subversion bump */
+	if (1) {
+		;
+	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2010-01-22 02:50:40 UTC (rev 26181)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2010-01-22 04:21:46 UTC (rev 26182)
@@ -2324,6 +2324,8 @@
 			writestruct(wd, ID_BR, "Brush", 1, brush);
 			if (brush->id.properties) IDP_WriteProperty(brush->id.properties, wd);
 			
+			writestruct(wd, DATA, "MTex", 1, &brush->mtex);
+			
 			if(brush->curve)
 				write_curvemapping(wd, brush->curve);
 		}