[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56533] tags/blender-2.67-release/blender: Merging r56528 through r56532 from trunk into blender-2.67-release

Sergey Sharybin sergey.vfx at gmail.com
Tue May 7 18:41:59 CEST 2013


Revision: 56533
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56533
Author:   nazgul
Date:     2013-05-07 16:41:59 +0000 (Tue, 07 May 2013)
Log Message:
-----------
Merging r56528 through r56532 from trunk into blender-2.67-release

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56528
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56532

Modified Paths:
--------------
    tags/blender-2.67-release/blender/release/datafiles/splash.png
    tags/blender-2.67-release/blender/source/blender/blenkernel/BKE_blender.h
    tags/blender-2.67-release/blender/source/blender/blenloader/intern/readfile.c
    tags/blender-2.67-release/blender/source/tools/tag_release.py

Property Changed:
----------------
    tags/blender-2.67-release/blender/
    tags/blender-2.67-release/blender/source/blender/editors/interface/interface.c
    tags/blender-2.67-release/blender/source/blender/editors/space_outliner/


Property changes on: tags/blender-2.67-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56528-56532

Modified: tags/blender-2.67-release/blender/release/datafiles/splash.png
===================================================================
(Binary files differ)

Modified: tags/blender-2.67-release/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- tags/blender-2.67-release/blender/source/blender/blenkernel/BKE_blender.h	2013-05-07 16:35:37 UTC (rev 56532)
+++ tags/blender-2.67-release/blender/source/blender/blenkernel/BKE_blender.h	2013-05-07 16:41:59 UTC (rev 56533)
@@ -41,8 +41,8 @@
 /* these lines are grep'd, watch out for our not-so-awesome regex
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION         266
-#define BLENDER_SUBVERSION      6
+#define BLENDER_VERSION         267
+#define BLENDER_SUBVERSION      0
 
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      262
@@ -50,9 +50,9 @@
 
 /* used by packaging tools */
 /* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR    a
+#define BLENDER_VERSION_CHAR    
 /* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE   alpha
+#define BLENDER_VERSION_CYCLE   release
 
 extern char versionstr[]; /* from blender.c */
 

Modified: tags/blender-2.67-release/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- tags/blender-2.67-release/blender/source/blender/blenloader/intern/readfile.c	2013-05-07 16:35:37 UTC (rev 56532)
+++ tags/blender-2.67-release/blender/source/blender/blenloader/intern/readfile.c	2013-05-07 16:41:59 UTC (rev 56533)
@@ -9346,7 +9346,7 @@
 	}
 	
 	/* default values in Freestyle settings */
-	{
+	if (main->versionfile < 267) {
 		Scene *sce;
 		SceneRenderLayer *srl;
 		FreestyleLineStyle *linestyle;
@@ -9404,7 +9404,7 @@
 		}
 	}
 
-	{
+	if (main->versionfile < 267) {
 		/* Initialize the active_viewer_key for compositing */
 		bScreen *screen;
 		Scene *scene;


Property changes on: tags/blender-2.67-release/blender/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/interface/interface.c:56528-56532


Property changes on: tags/blender-2.67-release/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/space_outliner:56528-56532

Modified: tags/blender-2.67-release/blender/source/tools/tag_release.py
===================================================================
--- tags/blender-2.67-release/blender/source/tools/tag_release.py	2013-05-07 16:35:37 UTC (rev 56532)
+++ tags/blender-2.67-release/blender/source/tools/tag_release.py	2013-05-07 16:41:59 UTC (rev 56533)
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-REV_BLENDER = 52841
-REV_EXTENSIONS = 4033
-REV_LOCALE = 1276
+REV_BLENDER = 56527
+REV_EXTENSIONS = 4510
+REV_LOCALE = 1837
 
-TAG_BLENDER = "blender-2.65-release"
-TAG_EXTENSIONS = TAG_LOCALE = "2_65_release"
+TAG_BLENDER = "blender-2.67-release"
+TAG_EXTENSIONS = TAG_LOCALE = "2_67_release"
 
 print("\n# Run these commands from the blender source dir:")
 




More information about the Bf-blender-cvs mailing list