[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20784] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 20784
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20784
Author:   ton
Date:     2009-06-10 17:09:44 +0200 (Wed, 10 Jun 2009)

Log Message:
-----------
2.5

Scene toolsettings was not setting Brush pointers on read, causing
crashes on reading files. Thanks Jingyuan for (irc) report! :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-06-10 13:19:38 UTC (rev 20783)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-06-10 15:09:44 UTC (rev 20784)
@@ -3827,12 +3827,19 @@
 			sce->world= newlibadr_us(fd, sce->id.lib, sce->world);
 			sce->set= newlibadr(fd, sce->id.lib, sce->set);
 			sce->ima= newlibadr_us(fd, sce->id.lib, sce->ima);
+			
 			sce->toolsettings->imapaint.brush=
 				newlibadr_us(fd, sce->id.lib, sce->toolsettings->imapaint.brush);
 			if(sce->toolsettings->sculpt)
 				sce->toolsettings->sculpt->brush=
 					newlibadr_us(fd, sce->id.lib, sce->toolsettings->sculpt->brush);
-
+			if(sce->toolsettings->vpaint)
+				sce->toolsettings->vpaint->brush=
+					newlibadr_us(fd, sce->id.lib, sce->toolsettings->vpaint->brush);
+			if(sce->toolsettings->wpaint)
+				sce->toolsettings->wpaint->brush=
+					newlibadr_us(fd, sce->id.lib, sce->toolsettings->wpaint->brush);
+			
 			sce->toolsettings->skgen_template = newlibadr(fd, sce->id.lib, sce->toolsettings->skgen_template);
 
 			for(base= sce->base.first; base; base= next) {

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c	2009-06-10 13:19:38 UTC (rev 20783)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c	2009-06-10 15:09:44 UTC (rev 20784)
@@ -1157,11 +1157,13 @@
 	cy-= 20;
 	uiBlockEndAlign(block);
 
-	rect.xmin= cx; rect.xmax= cx + w;
-	rect.ymin= cy - 200; rect.ymax= cy;
-	uiBlockBeginAlign(block);
-	curvemap_buttons(block, br->curve, (char)0, B_NOP, 0, &rect);
-	uiBlockEndAlign(block);
+	if(br->curve) {
+		rect.xmin= cx; rect.xmax= cx + w;
+		rect.ymin= cy - 200; rect.ymax= cy;
+		uiBlockBeginAlign(block);
+		curvemap_buttons(block, br->curve, (char)0, B_NOP, 0, &rect);
+		uiBlockEndAlign(block);
+	}
 }
 
 static void sculptmode_draw_interface_tools(Scene *scene, uiBlock *block, unsigned short cx, unsigned short cy)