[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37284] branches/soc-2011-onion/source/ blender/blenloader/intern/readfile.c: Revision: 30742

Jason Wilkins Jason.A.Wilkins at gmail.com
Tue Jun 7 03:49:33 CEST 2011


Revision: 37284
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37284
Author:   jwilkins
Date:     2011-06-07 01:49:31 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Revision: 30742
Author: nicholasbishop
Date: 12:44:34 AM, Monday, July 26, 2010
Message:
== Sculpt/Paint ==

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

**jwilkins: this doesn't have the type warning fix

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c	2011-06-07 00:05:48 UTC (rev 37283)
+++ branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c	2011-06-07 01:49:31 UTC (rev 37284)
@@ -4365,7 +4365,8 @@
 	CLAMP(ob->rotmode, ROT_MODE_MIN, ROT_MODE_MAX);
 
 	if(ob->paint) {
-		create_paintsession(ob);
+		ob->paint = MEM_callocN(sizeof(PaintSession), "PaintSession");
+		if(ob->mode & OB_MODE_SCULPT)
 		ob->paint->sculpt= MEM_callocN(sizeof(SculptSession), "reload sculpt session"); /*XXX: why not do this in create_paintsession? ~jwilkins*/
 	}
 }




More information about the Bf-blender-cvs mailing list