[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14286] trunk/blender/source/blender: The next testing build, the 2.45-16, nicked "Gamera".
Ton Roosendaal
ton at blender.org
Sun Mar 30 19:29:33 CEST 2008
Revision: 14286
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14286
Author: ton
Date: 2008-03-30 19:29:32 +0200 (Sun, 30 Mar 2008)
Log Message:
-----------
The next testing build, the 2.45-16, nicked "Gamera". :)
(Also: removed the ugly arbitrary 2 x rgb color hack that tried to make
shadeless color "useful" in opengl solid mode. Without overflowing
color it at least now shows the color you created.)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/blender/src/splash.jpg.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2008-03-30 16:18:01 UTC (rev 14285)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2008-03-30 17:29:32 UTC (rev 14286)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 245
-#define BLENDER_SUBVERSION 15
+#define BLENDER_SUBVERSION 16
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2008-03-30 16:18:01 UTC (rev 14285)
+++ trunk/blender/source/blender/src/drawobject.c 2008-03-30 17:29:32 UTC (rev 14286)
@@ -213,9 +213,9 @@
if(a<MAXMATBUF) {
if (ma->mode & MA_SHLESS) {
- matbuf[a][0][0]= 2*ma->r;
- matbuf[a][0][1]= 2*ma->g;
- matbuf[a][0][2]= 2*ma->b;
+ matbuf[a][0][0]= ma->r;
+ matbuf[a][0][1]= ma->g;
+ matbuf[a][0][2]= ma->b;
} else {
matbuf[a][0][0]= (ma->ref+ma->emit)*ma->r;
matbuf[a][0][1]= (ma->ref+ma->emit)*ma->g;
Modified: trunk/blender/source/blender/src/splash.jpg.c
===================================================================
--- trunk/blender/source/blender/src/splash.jpg.c 2008-03-30 16:18:01 UTC (rev 14285)
+++ trunk/blender/source/blender/src/splash.jpg.c 2008-03-30 17:29:32 UTC (rev 14286)
@@ -1,2649 +1,2281 @@
/* DataToC output of file <splash_jpg> */
-int datatoc_splash_jpg_size= 84581;
+int datatoc_splash_jpg_size= 72804;
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,225, 0, 0, 1, 4, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 7, 4, 5, 6, 8, 0, 3, 9, 2, 10, 1, 11, 1, 0, 0, 7, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3,
- 4, 5, 6, 7, 1, 8, 9, 10, 16, 0, 1, 3, 3, 3, 2, 3, 4, 6, 6, 5, 7, 6, 12, 2, 11, 1, 2, 3, 4, 17, 5, 6,
- 0, 18, 7, 33, 49, 65, 19, 8, 81, 97, 34, 20,113,129,145,161, 50, 9,177, 66, 35, 51, 21, 10,193, 82, 52, 22, 23,209,225, 98,
-114,130, 36, 53,240,241,146, 67, 83, 54,162,115,131, 68, 37, 38,150,182,214, 55,151, 26,178, 99, 24,194,179,100, 69,118,166,198,
- 39, 56, 25, 17, 0, 1, 3, 2, 4, 2, 6, 7, 5, 4, 9, 3, 2, 5, 5, 0, 1, 0, 2, 3, 17, 4, 33, 49, 18, 5, 65, 6,
- 81, 97,113, 34, 19, 7,240,129,145,161,209, 50, 20,177,193, 66, 35, 8,225, 82,210, 21,241, 98,114,130,146, 51,211, 36, 22, 67,
- 52, 23,162, 83,178,194, 85, 24, 9,226,242,115, 37, 53,255,218, 0, 12, 3, 1, 0, 2, 17, 3, 17, 0, 63, 0,251,244,208, 65,
-102,130, 9, 5,217, 87, 36,218,238, 74,179, 34, 43,151,116,192,150,171, 83,115,148,164,194, 93,196, 54,175, 32, 60, 81, 85,132,
- 23, 41,184,167,173, 59,105,181,233,152, 67, 39,211,233,241,116,157, 26,171,167, 85, 59,181,166, 52,173, 43, 78, 9,213,136,132,
-205, 31,212, 23, 8,181, 13,122,105,171, 77,123,218,107,133,105, 90, 87,138,228,238, 3,235,143,148,184,187,145,110,248, 15,170,
-123, 51,141, 48,110, 14,165, 55,139,117,149,168, 50,241,244, 56,175,217,148, 53, 25, 8,110,124, 50,159,194,234, 55, 46,157,106,
-179,208,120,171,150,191, 81, 59,207, 36,238,210,237, 92,239, 9,104,212,105, 35, 88, 1, 96, 57, 80, 52, 1, 36, 71,131,155, 87,
-127,107,135,183, 57,155,244,227,178,243,198,209, 22,237,200,211, 7, 29, 34,177,185,228,137, 8,206,165,196,152,229, 28, 90,234,
- 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,136,238, 15, 67,215, 94,208,219,119, 43,125,226, 6, 92,218,200,217, 34,120,171, 92,210, 11, 72, 60, 65, 11,
-196,251,150,217,113,179, 78,251, 91,184,221, 28,172, 52,115, 92, 8,112, 35,129, 5, 60,233,242, 98,179, 65, 5,154, 8, 44,208,
- 65,102,130, 11, 52, 16, 89,160,130,205, 4, 22,104, 32,179, 65, 5,154, 8, 44,208, 65,102,130, 11, 52, 16, 89,160,130,205, 4,
- 22,104, 32,179, 65, 5,154, 8, 44,208, 65,102,130, 11, 52, 16, 89,160,130,205, 4, 22,104, 32,179, 65, 5,154, 8, 44,208, 65,
-102,130, 11, 52, 16, 89,160,130,205, 4, 22,104, 32,179, 65, 5,154, 8, 44,208, 65,102,130, 11, 52, 16, 89,160,130,205, 4, 22,
-104, 32,179, 65, 5,154, 8, 44,208, 65,102,130, 11, 52, 16, 89,160,130,205, 4, 22,104, 32,179, 65, 5,154, 8, 44,208, 65,102,
-130, 11, 52, 16, 89,160,130,205, 4, 22,104, 32,179, 65, 5,154, 8, 46,110,250,156,129,235,110, 79, 36, 72, 95, 16,221,151, 15,
-143,126, 70, 10,108,173, 88, 38, 67,132,250, 94,242,211,243, 31, 59,243, 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, 53,167,123, 94,188, 75,181, 86,148,168,165, 41,141,
- 87,171, 60,165,222,124,182,219,182,150,183,152, 97,115,175,181, 59, 89,123, 36,120,165,123,186, 52, 96, 27,166,149,173, 13,107,
-194,138,129,103,252,247,234,239,140,239, 7, 30,203,185,102,239, 14,248,218, 66,228,218,226, 94, 32,220,165,193, 10, 0,164, 72,
- 75, 8,112, 50,165, 3, 80,149,144,105,214,148,166,188,187,206, 62, 97,243,231, 34, 92,253, 38,225,186, 17, 53, 49, 99, 36,142,
- 66,222,141, 90, 65,210, 79, 0,113,166, 52, 94,167,228,207, 46,121, 7,159,109,190,179,110,218,129,130,184, 61,241,203, 24,119,
- 78,141,100, 23, 1,196,129, 74,225, 84,206,246, 41,234,175,212,188, 11,109,202,237, 6,251,153,192,137,230, 61,105,186,222,154,
-137,111, 86,199,133, 21,228,188,226, 89,117,104, 93, 7, 64, 74, 73,235,223, 64,114,119,152, 30,115, 91, 69, 61,196,114, 77, 8,
-239, 70,249, 76,113,212, 30, 44, 46,210,226,211,213,221, 43,167,156,252,189,242, 90,234, 91,123,121, 35,130,115, 70,200,200, 68,
-146, 80,142, 15, 13,212,208,225,215,222, 25, 41, 15, 29,114, 39,168, 79, 69,153, 20,102,114, 44,114,237, 31, 17,187,203, 42,184,
-226,247,133,111,177, 93,202, 0, 14, 46, 28,148, 23, 27, 98, 66, 81,215,114, 15, 94,155,146, 69, 52,235,150,121,143,155,127, 78,
- 23, 77,101,253,179,197,156,142,239, 70,226, 12,111, 60, 76,111,110,166,181,244,232,207,241, 2, 50,105,204,252,183,202, 31,169,
- 75, 87,191,111,185, 97,188,141,189,217, 90, 8,145,131,128,145,142, 13,115,153, 94,145,135,225,112, 57,246,143, 15,245, 5,129,
-230,252, 59,120,230,123, 11,147, 38, 88,113,220,118,249,126,191, 90, 89,109, 6,249,110,123, 28,136,185,114,225, 41,181,173, 13,
-249,201, 66, 40,138,172, 37, 85, 4, 43,105,174,190,140,249,123,205,182, 94,101,217,193,123,182,190,172,149,193,148, 56, 22, 63,
- 0, 88,241,141, 11, 73, 21,165,106, 40, 69, 65, 11,230,231,152,188,165,123,229,133,229,197,150,230,202, 62, 38,151,213,184,135,
-176, 2, 67,216, 77, 42, 28, 1,165,105, 67, 80,104, 65, 67,143, 70,222,182,248, 47,215, 87, 26, 75,229, 46, 10,184,228, 18, 44,
-182,187,203,152,237,246,217,148,216, 92,199,239,150, 75,235, 44, 49, 33,113,221,108,169,214, 93,218,212,132, 31, 49,135, 86,131,
- 90, 5, 84, 29,105,220,219,202, 23,156,151,114, 45,111, 67, 67,203,117, 2,211, 80, 91, 82, 43,211,192,224, 64, 43, 43,228,206,
-118,177,231,187, 67,121, 96, 92, 88, 29,164,135, 55, 73, 14,160, 52, 60, 14, 4, 98, 9, 29,104,205,205,156,211,199, 62,158, 56,
-195, 43,230, 62, 90,190,171, 25,227,220, 38, 28,121,249, 37,241, 54,233, 55,101, 64,139, 41,246,163, 33, 95, 47, 17,167,228, 57,
-185,231,144,154, 33, 7,189, 79, 74,234, 43,103,218, 46, 55,235,150, 90, 90,183, 84,175, 52,104,168, 21,194,185,154, 12,130,153,
-222,247,187,110, 93,181,146,246,237,218, 97, 96,171,141, 9,160,173, 50, 0,156,202, 77,193, 92,235,198, 30,164,248,191, 25,230,
- 78, 28,200,255, 0,189,124,123,151,183,112,118,193,123, 54,233, 54,133,204, 69,178, 91,240,158, 38, 52,198, 88,146,214,217, 17,
-156, 72,222,129, 90, 84, 84, 16, 79,119,157,154,227,151,238, 95,103,118,221, 50,178,154,133, 65,165, 64, 35, 16, 72,200,133,205,
-139,124,182,230, 75, 72,239,108,223,174, 23,215, 75,168, 69,104, 75, 78, 4, 3,152, 60, 17,119, 81,106, 89,102,130, 11, 52, 16,
- 89,160,130,165, 28, 23,235,243,211,247,168,206,127,230,191, 78, 92, 93, 55, 41,186,102,220, 5, 38, 77,183,144, 46, 87, 28,121,
- 86,124,109,171,228, 11,140,139,100,152, 80,222,125,196,200,148,184,242,162,172, 41,192,192,108,138, 20, 45, 85,213,187,123,228,
-155,238, 94,177,182,191,186, 13, 17,220, 98,192, 13, 93, 77, 33,192,154, 96, 42, 8,194,181,233, 10,149,176,115,238,223,204,183,
-247, 91,117,161,121,146,216,210, 66, 91, 70,212, 56,180,128, 78, 38,132, 28,105, 78,130,174,190,170, 42,234,179, 65, 5, 18,207,
-179,172, 87,140, 48,124,195,146, 51,171,187, 24,254, 23,128,227, 23,204,199, 44,190, 73, 66,221, 98,211,142,227,113,157,153, 50,
- 66,144,210, 86,235,158, 84,118, 84,173,136, 73, 81,165, 18, 9, 32,105,213,141,148,187,148,209,219,194,221, 82, 61,193,173, 29,
- 46,113,160, 30,178, 83, 77,194,254, 45,174, 9, 46,103,118,152,227,105,123,143, 67, 90, 42, 79, 78, 0,112,197,124,234,175,243,
-234,230,254, 83,184,223, 47,222,147,191, 45,222,101,230,158, 32,199,174, 50, 33,185,157, 72,185, 92, 89,184,222, 4, 93,170, 90,
- 4, 91, 54, 61,122,137, 9,224,223, 82,202,101,200, 88, 10, 73, 82, 71, 99,188, 59,201,107, 13,164, 54, 61,215,119,130, 11,135,
- 10,232,238,208, 87,173,207, 97, 35,175, 75, 71, 90,243,179,124,247,220, 55,146,249,118,125,146,226,226,217,166,154,234,234,154,
-112,163, 35,120, 6,156, 53, 56,226, 48, 93, 31,252,188,255, 0, 52,110, 28,252,192, 96,101, 22, 91, 30, 57,127,226,190, 97,192,
- 67,107,206,120,151, 45,125, 19, 46, 22,248,142, 57,228,252,228, 9,136,109,129, 62, 50, 36,254,193,210,182, 90,117,183, 5, 28,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list