[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30742] branches/soc-2010-nicolasbishop/ source/blender: == Sculpt/Paint ==

[Nicholas Bishop]

Revision: 30742
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30742
Author:   nicholasbishop
Date:     2010-07-26 07:44:34 +0200 (Mon, 26 Jul 2010)

Log Message:
-----------
== Sculpt/Paint ==

* Fixed a crash on loading files with a paint mode active
* Fixed a type warning

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c	2010-07-26 05:31:31 UTC (rev 30741)
+++ branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c	2010-07-26 05:44:34 UTC (rev 30742)
@@ -4123,8 +4123,9 @@
 	link_list(fd, &ob->pc_ids);
 
 	if(ob->paint) {
-		create_paintsession(ob);
-		ob->paint->sculpt= MEM_callocN(sizeof(SculptSession), "reload sculpt session");
+		ob->paint = MEM_callocN(sizeof(PaintSession), "PaintSession");
+		if(ob->mode & OB_MODE_SCULPT)
+			ob->paint->sculpt= MEM_callocN(sizeof(SculptSession), "reload sculpt session");
 	}
 }
 

Modified: branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-26 05:31:31 UTC (rev 30741)
+++ branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-26 05:44:34 UTC (rev 30742)
@@ -1049,7 +1049,7 @@
 
 void paint_stroke_projection_mat(PaintStroke *stroke, float (**pmat)[4])
 {
-	*pmat = &stroke->project_mat;
+	*pmat = stroke->project_mat;
 }
 
 void *paint_stroke_mode_data(struct PaintStroke *stroke)