[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30571] trunk/blender/source/blender/ blenloader/intern/readfile.c: 2.5: move some do_versions compatibility code under < 253 check.

[Brecht Van Lommel]

Revision: 30571
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30571
Author:   blendix
Date:     2010-07-21 11:25:00 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
2.5: move some do_versions compatibility code under < 253 check.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2010-07-21 
09:16:27 UTC (rev 30570)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2010-07-21 
09:25:00 UTC (rev 30571)
@@ -10853,12 +10853,13 @@
        }
        
 
-       /* put 2.50 compatibility code here until next subversion bump */
+       if (main->versionfile < 253)
        {
                Object *ob;
                Scene *scene;
                bScreen *sc;
                Tex *tex;
+               Brush *brush;
 
                for (sc= main->screen.first; sc; sc= sc->id.next) {
                        ScrArea *sa;
@@ -10974,12 +10975,9 @@
                                SEQ_END
                        }
                }
-       }
 
-       {
                /* GSOC 2010 Sculpt - New settings for Brush */
 
-               Brush *brush;
                for (brush= main->brush.first; brush; brush= brush->id.next) {
                        /* Sanity Check */
 
@@ -11052,6 +11050,10 @@
                }
        }
 
+       /* put compatibility code here until next subversion bump */
+       {
+       }
+
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! 
*/
        /* WATCH IT 2!: Userdef struct init has to be in 
editors/interface/resources.c! */
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs