[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16106] branches/apricot: svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Thu Aug 14 11:19:06 CEST 2008
Revision: 16106
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16106
Author: campbellbarton
Date: 2008-08-14 11:18:57 +0200 (Thu, 14 Aug 2008)
Log Message:
-----------
svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/apricot/release/VERSION
branches/apricot/release/datafiles/splash.jpg
branches/apricot/source/blender/blenkernel/BKE_blender.h
branches/apricot/source/blender/src/splash.jpg.c
branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/apricot/source/gameengine/Expressions/InputParser.cpp
branches/apricot/source/gameengine/Expressions/ListValue.cpp
branches/apricot/source/gameengine/Expressions/PyObjectPlus.cpp
branches/apricot/source/gameengine/Expressions/PyObjectPlus.h
branches/apricot/source/gameengine/Expressions/Value.cpp
branches/apricot/source/gameengine/Expressions/Value.h
branches/apricot/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/apricot/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/apricot/source/gameengine/Ketsji/BL_Shader.cpp
branches/apricot/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_CameraActuator.h
branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.h
branches/apricot/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/apricot/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ParentActuator.h
branches/apricot/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/apricot/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/apricot/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/apricot/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/apricot/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/apricot/source/gameengine/PyDoc/KX_CameraActuator.py
branches/apricot/source/gameengine/PyDoc/KX_ParentActuator.py
branches/apricot/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/apricot/source/gameengine/PyDoc/KX_TrackToActuator.py
Added Paths:
-----------
branches/apricot/release/text/release_247.txt
Removed Paths:
-------------
branches/apricot/release/text/release_246.txt
Modified: branches/apricot/release/VERSION
===================================================================
--- branches/apricot/release/VERSION 2008-08-14 08:58:25 UTC (rev 16105)
+++ branches/apricot/release/VERSION 2008-08-14 09:18:57 UTC (rev 16106)
@@ -1 +1 @@
-2.46
+2.47
Modified: branches/apricot/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Deleted: branches/apricot/release/text/release_246.txt
===================================================================
--- branches/apricot/release/text/release_246.txt 2008-08-14 08:58:25 UTC (rev 16105)
+++ branches/apricot/release/text/release_246.txt 2008-08-14 09:18:57 UTC (rev 16106)
@@ -1,13 +0,0 @@
-------------------------- Blender 2.46 release ----------------
-
-May 2008
-
-This is the release of version 2.46, the result of 9 months of development,
-including everything as used to render the open movie Big Buck Bunny.
-
-For html versions of release logs, with images and examples, please check:
-http://www.blender.org
-
-Have fun!
-
-The blender.org team.
Copied: branches/apricot/release/text/release_247.txt (from rev 16105, trunk/blender/release/text/release_247.txt)
===================================================================
--- branches/apricot/release/text/release_247.txt (rev 0)
+++ branches/apricot/release/text/release_247.txt 2008-08-14 09:18:57 UTC (rev 16106)
@@ -0,0 +1,15 @@
+------------------------- Blender 2.47 release ----------------
+
+Aug 2008
+
+This is the upgrade release of 2.47, it is a bugfix release to stabilize
+the 2.4x series. No new feature have been added, but serious effort has
+been put in tracking bugs and fixing them. Some performance issues have
+also been addressed.
+
+For html versions of release logs, please check:
+http://www.blender.org
+
+Have fun!
+
+The blender.org team.
Modified: branches/apricot/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_blender.h 2008-08-14 08:58:25 UTC (rev 16105)
+++ branches/apricot/source/blender/blenkernel/BKE_blender.h 2008-08-14 09:18:57 UTC (rev 16106)
@@ -40,8 +40,8 @@
struct ListBase;
struct MemFile;
-#define BLENDER_VERSION 246
-#define BLENDER_SUBVERSION 1
+#define BLENDER_VERSION 247
+#define BLENDER_SUBVERSION 0
#define BLENDER_MINVERSION 245
#define BLENDER_MINSUBVERSION 15
Modified: branches/apricot/source/blender/src/splash.jpg.c
===================================================================
--- branches/apricot/source/blender/src/splash.jpg.c 2008-08-14 08:58:25 UTC (rev 16105)
+++ branches/apricot/source/blender/src/splash.jpg.c 2008-08-14 09:18:57 UTC (rev 16106)
@@ -1,2990 +1,1590 @@
/* DataToC output of file <splash_jpg> */
-int datatoc_splash_jpg_size= 95515;
+int datatoc_splash_jpg_size= 50665;
char datatoc_splash_jpg[]= {
-255,216,255,224, 0, 16, 74, 70, 73, 70, 0, 1, 2, 0, 0,100, 0,100, 0, 0,255,236, 0, 17, 68,117, 99,
-107,121, 0, 1, 0, 4, 0, 0, 0, 95, 0, 0,255,238, 0, 14, 65,100,111, 98,101, 0,100,192, 0, 0, 0, 1,255,219, 0,132,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 1, 1, 1, 1, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5,255,192, 0, 17, 8, 1, 26, 1,245, 3, 1, 17, 0, 2, 17, 1, 3, 17, 1,255,196, 0,230, 0, 0, 0, 6, 3, 1, 1,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 6, 7, 8, 0, 2, 9, 1, 10, 11, 1, 0, 0, 7, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 16, 0, 1, 3, 3, 3, 1, 4, 4, 9, 8, 5, 8, 5,
- 8, 5, 13, 1, 2, 3, 4, 17, 5, 6, 0, 18, 7, 33, 49, 65, 19, 8, 81, 97, 34, 20,113,129,145, 50, 35, 51, 52, 21, 9,240,
-161,177,193, 66, 82, 98, 53,225,149,213, 22, 54,209,241,114, 36,212, 69, 85, 24,194, 67, 83, 99,148,130,162,179, 37,117,181, 23,
- 55,115,195, 68,133, 10,146,178,210,131,147,211,116,196,165,197, 38, 70, 71, 17, 0, 1, 3, 2, 4, 2, 6, 5, 8, 8, 5, 4,
- 2, 1, 5, 1, 1, 17, 2, 3, 0, 4, 33, 49, 18, 5, 65, 6, 81, 97,113, 34, 19, 7,129,145,161, 50, 20,240,177,193,209, 66,
-146, 83,211,225,114, 35, 51, 67, 21, 23, 8,241, 82, 98,130,210,178, 36, 52, 22,194,115,162,226, 99, 68,116, 9, 53,255,218, 0,
- 12, 3, 1, 0, 2, 17, 3, 17, 0, 63, 0,251,244,208,161, 89,161, 66,136, 93,149,114, 77,174,228,171, 50, 34,185,119, 76, 9,
-106,181, 55, 57, 74, 76, 37,220, 67,106,240, 3,197, 21, 88, 65,114,155,138,122,211,179, 81,175, 76,194, 25, 62, 31, 79,139,164,
-232,212,186,117, 39,117, 83, 20, 84, 84,225, 82,172, 68, 38,104,254, 32,184, 69,168,107,210,154,180,175,123, 74,224,168,168,188,
-107,147,184, 15,158, 62, 82,226,238, 69,187,224, 62,105,236,206, 52,193,184, 58,148,222, 45,214, 86,160,203,199,208,226,190,140,
-161,168,200, 67,115,225,148,252,215, 81,185,116,235, 85,158,131,197, 92,181,253,196,239, 60,147,187, 75,181,115,188, 37,163, 81,
- 73, 26,192, 11, 1,201, 3, 64, 18, 68,120, 57,170,239,214,225,237,206,102,254,220,118, 94,120,218, 34,221,185, 26, 96,227,164,
- 44,110,121, 34, 66, 51, 82,226, 76,114,142, 45,114, 55,169,185,158,172, 99,217, 21,139, 44,179,192,200, 49,171,180, 27,221,150,
-230,194, 36,193,185, 91,100,166, 84, 73, 44,172, 84, 20,173, 4,142,157,132,118,131,208,245,215,180, 54,221,202,223,120,129,151,
- 54,178, 54, 72,158, 21,174,105, 5,164, 30, 32,138,241, 62,229,182, 92,108,211,190,214,238, 55, 71, 43, 10, 57,174, 4, 56, 17,
-192,131, 75, 58,157, 80,107, 52, 40, 86,104, 80,172,208,161, 89,161, 66,179, 66,133,102,133, 10,205, 10, 21,154, 20, 43, 52, 40,
- 86,104, 80,172,208,161, 89,161, 66,179, 66,133,102,133, 10,205, 10, 21,154, 20, 43, 52, 40, 86,104, 80,172,208,161, 89,161, 66,
-179, 66,133,102,133, 10,205, 10, 21,154, 20, 43, 52, 40, 86,104, 80,172,208,161, 89,161, 66,179, 66,133,102,133, 10,205, 10, 21,
-154, 20, 43, 52, 40, 86,104, 80,172,208,161, 89,161, 66,179, 66,133,102,133, 10,205, 10, 21,154, 20, 43, 52, 40, 86,104, 80,172,
-208,161, 89,161, 66,179, 66,133,102,133, 10,205, 10, 21,154, 20, 43, 52, 40, 86,104, 80,172,208,161, 89,161, 66,179, 66,133,102,
-133, 10,205, 10, 21,154, 20, 43, 52, 40, 86,104, 80,174,110,249,156,129,231,110, 79, 36, 72, 95, 16,221,151, 15,143,125,198, 10,
-108,173, 88, 38, 67,132,250, 94,240,211,239, 30,251,239, 32, 58,183, 11,251,138, 72, 37, 59,118,210,134,186,242,199,155, 27, 63,
-152,251,134,236,231,114,252,205,109,142,150,232, 12,124,108, 42,157,237,122,241, 46,212,168,138, 17, 19, 21,175, 86,121, 75,188,
-249,109,183,109, 45,111, 48,194,231, 95,106,118,178,246, 72,240,139,221,209,163, 0,221, 40,170,133, 87,130, 85, 2,207,249,239,
-205,223, 25,222, 14, 61,151,114,205,222, 29,241,180,133,201,181,196,188, 65,185, 75,130, 20, 1, 72,144,150, 16,224,101, 74, 6,
-161, 43, 32,211,173, 41, 77,121,119,156,124,195,231,206, 68,185,248, 77,195,116, 34,100,197,140,146, 57, 11,122, 53,105, 7, 73,
- 60, 1,197, 49, 74,245, 63, 38,121,115,200, 60,251,109,241,155,118,212, 12, 11,131,223, 28,177,135,116,232,214, 65,112, 28, 72,
- 8,184, 45, 35,189,138,121,171,243, 47, 2,219,114,187, 65,190,230,112, 34,120,143, 90,110,183,166,162, 91,213,177,225, 69,120,
- 47, 56,150, 93, 90, 23, 65,208, 18,146,122,246,232, 14, 78,243, 3,206,107,104,167,184,142, 73,161, 29,232,223, 41,142, 53, 7,
-139, 11,180,184,180,245,119, 77, 25,231, 63, 47,124,150,186,150,222,222, 72,224,156,163,100,100, 34, 73, 16,142, 15, 13,212,208,
-225,215,222, 25, 83,135,142,185, 19,204, 39,146,204,138, 51, 57, 22, 57,118,143,136,221,229,149, 92,113,123,194,183,216,174,229,
- 0, 7, 23, 14, 74, 11,141,177, 33, 40,235,185, 7,175, 77,201, 34,154,149,203, 60,199,205,191,219,133,211, 89,127,108,241,103,
- 35,187,209,184,131, 27,207, 19, 27,219,169,173,122,116,103,246,129, 25, 68,230,126, 91,229, 15,238, 82,213,239,219,238, 88,111,
- 35,111,118, 86,130, 36, 96,224, 36, 99,131, 92,230, 47, 72,195,236,184, 28,251, 71,135,249,130,192,243,126, 29,188,115, 61,133,
-201,147, 44, 56,238, 59,124,191, 95,173, 44,182,131,124,183, 61,142, 68, 92,185,112,148,218,214,134,252,100,161, 20, 69, 86, 18,
-170,130, 21,180,215, 95, 70,124,189,230,219, 47, 50,236,224,189,219, 94,172,149,193,136,112, 44,126, 0,177,227, 20, 45, 36, 42,
- 42,132, 33, 65, 21,243,115,204, 94, 82,189,242,194,242,226,203,115, 98, 62, 38,151,171,113, 15, 96, 4,135,176,148, 80,224, 10,
- 42, 33, 80, 80,131, 81,199,147,111, 59,124, 23,231,171,141, 37,242,151, 5, 92,114, 9, 22, 91, 93,229,204,118,251,108,202,108,
- 46, 99,247,203, 37,245,150, 24,144,184,238,182, 84,235, 46,237,106, 66, 15,136,195,171, 65,173, 2,170, 14,186,119, 54,242,133,
-231, 37,220,139, 91,208,208,242,221, 64,180,168, 45, 82, 23,167,129,192,128,107,149,242,103, 59, 88,243,221,161,188,176, 46, 44,
- 14,210, 67,155,164,135, 32, 40,120, 28, 8,196, 18, 58,234,102,230,206,105,227,159, 47, 28, 97,149,243, 31, 45, 95, 85,140,241,
-238, 19, 14, 60,252,146,248,155,116,155,178,160, 69,148,251, 81,144,175,119,136,211,242, 28,220,243,200, 77, 16,131,219, 83,210,
-186,170,217,246,139,141,250,229,150,150,173,213, 43,202, 52, 40, 11,130,230, 80,100, 42,231,123,222,237,185,118,214, 75,219,183,
-105,133,129, 92, 80,148, 10,153, 0, 78,102,139,112, 87, 58,241,135,153, 62, 47,198,121,147,135, 50, 63,239, 95, 30,229,237,220,
- 29,176, 94,205,186, 77,161,115, 17,108,150,252, 39,137,141, 49,150, 36,181,182, 68,103, 18, 55,160, 86,149, 21, 4, 18,123,206,
-205,113,203,247, 47,179,187,110,153, 88,154,130,130,138, 1, 24,130, 70, 68, 81,108, 91,229,183, 50, 90, 71,123,102,253,112,189,
-116,185, 8, 84, 37,167, 2, 1,204, 30, 21, 46,234,174,173,171, 52, 40, 86,104, 80,172,208,161, 84,163,130,252,254,121,126,243,
- 25,207,252,215,229,203,139,166,229, 55, 76,219,128,164,201,182,242, 5,202,227,143, 42,207,141,181,124,129,113,145,108,147, 10,
- 27,207,184,153, 18,151, 30, 84, 85,133, 56, 24, 13,145, 66,133,170,186,215,111,124,147,125,203,214, 54,215,247, 65,162, 59,140,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list