[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37350] branches/soc-2011-salad/source/ blender/blenloader/intern/readfile.c: MatCap fileversion

[Jason Wilkins]

Revision: 37350
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37350
Author:   jwilkins
Date:     2011-06-09 23:15:41 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
MatCap fileversion

was automatically changing object draw mode from OB_TEXTURE to OB_MATCAP if fileversion was less than 2, but since I put fileversion back to 1, this would have the effect of not letting the user save an object with OB_TEXTURE

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

Modified: branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c	2011-06-09 23:11:12 UTC (rev 37349)
+++ branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c	2011-06-09 23:15:41 UTC (rev 37350)
@@ -11378,7 +11378,7 @@
 	}
 
 	/* GSOC Sculpt 2011 - MatCap */
-	if (main->versionfile < 257 || (main->versionfile == 257 && main->subversionfile < 2)) {
+	if (main->versionfile < 257 || (main->versionfile == 257 && main->subversionfile < 1)) {
 		Object *ob;
 
 		/* MatCaps */