2.5

- Weightpaint back (CTRL+TAB or menu)
  Also weightpaint is sortof non-modal, allowing to use all existing
  hotkeys while in paint mode. Only leftmouse is overridden.
- Made vpaint and wpaint entirely local, stored in scene (and saved!)
- Small bugfix (also in 2.48): on weightpaint mode, all armature objects
  in 3d window were drawing as active poses. Now only the armature 
  deformer is.

Nice point for the UI agenda: are paint modes on ACTION mouse? Only then
you can combine it with SELECT mouse...

2 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ac0b819aa6b..8c979a68d9a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3604,7 +3604,10 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 	sce->radio= newdataadr(fd, sce->radio);
 	
 	sce->toolsettings= newdataadr(fd, sce->toolsettings);
-
+	if(sce->toolsettings) {
+		sce->toolsettings->vpaint= newdataadr(fd, sce->toolsettings->vpaint);
+		sce->toolsettings->wpaint= newdataadr(fd, sce->toolsettings->wpaint);
+	}
 	sce->sculptdata.session= NULL;
 	/* SculptData textures */
 	for(a=0; a<MAX_MTEX; ++a)
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 57dde906fa3..436980ef421 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1472,6 +1472,10 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 
 		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);
+		if(sce->toolsettings->wpaint)
+			writestruct(wd, DATA, "VPaint", 1, sce->toolsettings->wpaint);
 
 		for(a=0; a<MAX_MTEX; ++a)
 			writestruct(wd, DATA, "MTex", 1, sce->sculptdata.mtex[a]);