[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48812] trunk/blender/source/blender: Bump Blender version, so despill balance would stay untouched in

[Sergey Sharybin]

Revision: 48812
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48812
Author:   nazgul
Date:     2012-07-10 15:35:25 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Bump Blender version, so despill balance would stay untouched in
rare cases when it was intentionally set to 0.

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

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h       2012-07-10 
15:28:32 UTC (rev 48811)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h       2012-07-10 
15:35:25 UTC (rev 48812)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         263
-#define BLENDER_SUBVERSION      13
+#define BLENDER_SUBVERSION      14
 
 #define BLENDER_MINVERSION      250
 #define BLENDER_MINSUBVERSION   0

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2012-07-10 
15:28:32 UTC (rev 48811)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2012-07-10 
15:35:25 UTC (rev 48812)
@@ -7840,7 +7840,7 @@
                        ntreetype->foreach_nodetree(main, NULL, 
do_version_ntree_dilateerode_264);
        }
 
-       {
+       if (main->versionfile < 263 || (main->versionfile == 263 && 
main->subversionfile < 14)) {
                bNodeTreeType *ntreetype = ntreeGetType(NTREE_COMPOSIT);
 
                if (ntreetype && ntreetype->foreach_nodetree)

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