[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41260] branches/cycles: Cycles: theme changes, some code syncing with trunk.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Oct 24 21:32:11 CEST 2011


Revision: 41260
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41260
Author:   blendix
Date:     2011-10-24 19:32:10 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Cycles: theme changes, some code syncing with trunk.

Modified Paths:
--------------
    branches/cycles/intern/cycles/blender/addon/ui.py
    branches/cycles/source/blender/editors/datafiles/bfont.ttf.c
    branches/cycles/source/blender/editors/datafiles/bmonofont.ttf.c
    branches/cycles/source/blender/editors/gpencil/drawgpencil.c
    branches/cycles/source/blender/editors/include/ED_gpencil.h
    branches/cycles/source/blender/editors/interface/interface_draw.c
    branches/cycles/source/blender/editors/interface/interface_intern.h
    branches/cycles/source/blender/editors/interface/interface_panel.c
    branches/cycles/source/blender/editors/interface/interface_style.c
    branches/cycles/source/blender/editors/interface/interface_widgets.c
    branches/cycles/source/blender/editors/screen/area.c
    branches/cycles/source/blender/editors/space_view3d/drawmesh.c
    branches/cycles/source/blender/editors/space_view3d/space_view3d.c
    branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
    branches/cycles/source/blender/editors/space_view3d/view3d_intern.h
    branches/cycles/source/blender/editors/space_view3d/view3d_ops.c
    branches/cycles/source/blender/editors/space_view3d/view3d_toolbar.c

Modified: branches/cycles/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/ui.py	2011-10-24 18:01:14 UTC (rev 41259)
+++ branches/cycles/intern/cycles/blender/addon/ui.py	2011-10-24 19:32:10 UTC (rev 41260)
@@ -363,7 +363,6 @@
 class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
     bl_label = "Lamp"
     bl_context = "data"
-    bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):

Modified: branches/cycles/source/blender/editors/datafiles/bfont.ttf.c
===================================================================
--- branches/cycles/source/blender/editors/datafiles/bfont.ttf.c	2011-10-24 18:01:14 UTC (rev 41259)
+++ branches/cycles/source/blender/editors/datafiles/bfont.ttf.c	2011-10-24 19:32:10 UTC (rev 41260)
@@ -2,4533 +2,5621 @@
  *  \ingroup eddatafiles
  */
 /* DataToC output of file <bfont_ttf> */
-
-int datatoc_bfont_ttf_size= 190044;
+ 
+int datatoc_bfont_ttf_size= 191532;
 char datatoc_bfont_ttf[]= {
-  0,  1,  0,  0,  0, 19,  1,  0,  0,  4,  0, 48, 71, 68, 69, 70,  0, 38,  3,135,  0,  2, 61, 32,  0,  0,  0, 30,
- 71, 80, 79, 83,148,189,162,240,  0,  2, 61, 64,  0,  0,168,250, 71, 83, 85, 66,108,145,116,143,  0,  2,230, 60,  0,  0,  0, 32,
- 76, 84, 83, 72,201,155,185, 32,  0,  0, 16, 28,  0,  0,  3,134, 79, 83, 47, 50,160,203,149,139,  0,  0,  1,184,  0,  0,  0, 96,
- 99,109, 97,112,206, 17,212,162,  0,  0, 86,120,  0,  0,  7,158, 99,118,116, 32, 57,126, 62, 76,  0,  0,104, 12,  0,  0,  1,252,
-102,112,103,109,115,211, 35,176,  0,  0, 94, 24,  0,  0,  7,  5,103, 97,115,112,  0,  4,  0,  7,  0,  2, 61, 20,  0,  0,  0, 12,
-103,108,121,102,197,190, 63,150,  0,  0,113, 16,  0,  1,168, 30,104,100,109,120,239, 14,250,171,  0,  0, 19,164,  0,  0, 66,212,
-104,101, 97,100,234,253,135,111,  0,  0,  1, 60,  0,  0,  0, 54,104,104,101, 97, 12, 83,  9,164,  0,  0,  1,116,  0,  0,  0, 36,
-104,109,116,120,210,203, 46, 39,  0,  0,  2, 24,  0,  0, 14,  4,108,111, 99, 97,146,250, 41, 76,  0,  0,106,  8,  0,  0,  7,  6,
-109, 97,120,112,  6, 42,  2,133,  0,  0,  1,152,  0,  0,  0, 32,110, 97,109,101,181, 88,144, 86,  0,  2, 25, 48,  0,  0,  6,162,
-112,111,115,116,216, 80,169, 39,  0,  2, 31,212,  0,  0, 29, 63,112,114,101,112,130,220, 33, 19,  0,  0,101, 32,  0,  0,  2,236,
-  0,  1,  0,  0,  0,  1,  0,  0, 89,115,200,195, 95, 15, 60,245,  0, 25,  8,  0,  0,  0,  0,  0,193,154, 51,  0,  0,  0,  0,  0,
-197, 83,  9, 61,251,137,253,213,  9, 90,  8, 98,  0,  0,  0,  6,  0,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  7,109,254, 29,
-  0,  0,  9,100,251,137,254,162,  9, 90,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,128,  0,  1,  0,  0,
-  3,130,  0,160,  0, 22,  0,122,  0,  5,  0,  2,  0, 16,  0, 47,  0, 90,  0,  0,  2, 31,  1, 57,  0,  3,  0,  1,  0,  3,  4,153,
-  1,144,  0,  5,  0,  8,  5,154,  5, 51,  0,  0,  1, 30,  5,154,  5, 51,  0,  0,  3,208,  0,102,  1,242,  0,  0,  2, 11,  6,  6,
-  3,  8,  4,  2,  2,  4,224,  0,  2,239, 64,  0, 32, 91,  0,  0,  0, 40,  0,  0,  0,  0, 49, 65, 83, 67,  0, 64,  0, 32,255,253,
-  6, 31,254, 20,  0,132,  7,109,  1,227, 32,  0,  1,159,  0,  0,  0,  0,  4, 74,  5,182,  0,  0,  0, 32,  0,  2,  4,205,  0,193,
-  0,  0,  0,  0,  4, 20,  0,  0,  2, 20,  0,  0,  2, 39,  0,147,  3, 55,  0,133,  5, 43,  0, 51,  4,104,  0,123,  6,154,  0,102,
-  5,158,  0,109,  1,207,  0,133,  2,104,  0, 82,  2,104,  0, 61,  4,104,  0, 82,  4,104,  0,102,  2,  0,  0, 63,  2,147,  0, 82,
-  2, 37,  0,147,  2,252,  0, 20,  4,104,  0, 98,  4,104,  0,178,  4,104,  0, 96,  4,104,  0, 82,  4,104,  0, 23,  4,104,  0,131,
-  4,104,  0,113,  4,104,  0, 90,  4,104,  0,106,  4,104,  0,106,  2, 37,  0,147,  2, 37,  0, 63,  4,104,  0,102,  4,104,  0,102,
-  4,104,  0,102,  3,104,  0, 37,  6,238,  0,109,  4,221,  0,  0,  4,248,  0,199,  4,211,  0,125,  5,121,  0,199,  4, 57,  0,199,
-  3,238,  0,199,  5,133,  0,125,  5,156,  0,199,  2,182,  0, 82,  2, 43,255, 72,  4,162,  0,199,  3,238,  0,199,  6,246,  0,199,
-  5,213,  0,199,  5,240,  0,125,  4,156,  0,199,  5,238,  0,125,  4,184,  0,199,  4, 39,  0,104,  4, 39,  0, 20,  5,150,  0,184,
-  4,139,  0,  0,  7, 18,  0, 20,  4, 96,  0,  0,  4, 55,  0,  0,  4, 80,  0, 82,  2,109,  0,164,  2,252,  0, 23,  2,109,  0, 51,
-  4, 66,  0, 41,  3, 74,255,252,  4,158,  1,137,  4, 63,  0, 94,  4,176,  0,174,  3,180,  0,113,  4,176,  0,113,  4, 72,  0,113,
-  2,162,  0, 29,  4, 37,  0, 37,  4,182,  0,174,  2, 18,  0,160,  2, 18,255,188,  3,248,  0,174,  2, 18,  0,174,  7, 43,  0,174,
-  4,182,  0,174,  4,158,  0,113,  4,176,  0,174,  4,176,  0,113,  3, 49,  0,174,  3,156,  0, 90,  2,182,  0, 33,  4,182,  0,164,
-  3,213,  0,  0,  5,248,  0, 20,  4,  0,  0, 35,  3,233,  0, 10,  3,135,  0, 82,  2,213,  0, 61,  4,104,  1,233,  2,213,  0, 51,
-  4,104,  0,102,  2, 20,  0,  0,  2, 39,  0,147,  4,104,  0,188,  4,104,  0, 68,  4,104,  0,123,  4,104,  0, 29,  4,104,  1,233,
-  3,227,  0,121,  4,158,  1, 51,  6,168,  0,100,  2,166,  0, 68,  3,229,  0, 82,  4,104,  0,102,  2,147,  0, 82,  6,168,  0,100,
-  4,  0,255,250,  3,109,  0,123,  4,104,  0,102,  2,166,  0, 49,  2,166,  0, 31,  4,158,  1,137,  4,193,  0,174,  5, 61,  0,113,
-  2, 37,  0,147,  1,164,  0, 35,  2,166,  0, 63,  2,205,  0, 66,  3,229,  0, 84,  5,229,  0, 63,  5,229,  0, 44,  5,229,  0, 31,
-  3,104,  0, 68,  4,221,  0,  0,  4,221,  0,  0,  4,221,  0,  0,  4,221,  0,  0,  4,221,  0,  0,  4,221,  0,  0,  6,209,255,254,
-  4,211,  0,125,  4, 57,  0,199,  4, 57,  0,199,  4, 57,  0,199,  4, 57,  0,199,  2,182,  0, 62,  2,182,  0, 82,  2,182,  0, 17,
-  2,182,  0, 64,  5,121,  0, 47,  5,213,  0,199,  5,240,  0,125,  5,240,  0,125,  5,240,  0,125,  5,240,  0,125,  5,240,  0,125,
-  4,104,  0,141,  5,240,  0,125,  5,150,  0,184,  5,150,  0,184,  5,150,  0,184,  5,150,  0,184,  4, 55,  0,  0,  4,156,  0,199,
-  4,209,  0,174,  4, 63,  0, 94,  4, 63,  0, 94,  4, 63,  0, 94,  4, 63,  0, 94,  4, 63,  0, 94,  4, 63,  0, 94,  6,170,  0, 94,
-  3,180,  0,113,  4, 72,  0,113,  4, 72,  0,113,  4, 72,  0,113,  4, 72,  0,113,  2, 18,255,222,  2, 18,  0,174,  2, 18,255,189,
-  2, 18,255,238,  4,158,  0,111,  4,182,  0,174,  4,158,  0,113,  4,158,  0,113,  4,158,  0,113,  4,158,  0,113,  4,158,  0,113,
-  4,104,  0,102,  4,158,  0,115,  4,182,  0,164,  4,182,  0,164,  4,182,  0,164,  4,182,  0,164,  3,233,  0, 10,  4,176,  0,174,
-  3,233,  0, 10,  4,221,  0,  0,  4, 63,  0, 94,  4,221,  0,  0,  4, 63,  0, 94,  4,221,  0,  0,  4, 63,  0, 94,  4,211,  0,125,
-  3,180,  0,113,  4,211,  0,125,  3,180,  0,113,  4,211,  0,125,  3,180,  0,113,  4,211,  0,125,  3,180,  0,113,  5,121,  0,199,
-  4,176,  0,113,  5,121,  0, 47,  4,176,  0,113,  4, 57,  0,199,  4, 72,  0,113,  4, 57,  0,199,  4, 72,  0,113,  4, 57,  0,199,
-  4, 72,  0,113,  4, 57,  0,199,  4, 72,  0,113,  4, 57,  0,199,  4, 72,  0,113,  5,133,  0,125,  4, 37,  0, 37,  5,133,  0,125,
-  4, 37,  0, 37,  5,133,  0,125,  4, 37,  0, 37,  5,133,  0,125,  4, 37,  0, 37,  5,156,  0,199,  4,182,  0,174,  5,156,  0,  0,
-  4,182,  0, 18,  2,182,255,245,  2, 18,255,163,  2,182,  0, 61,  2, 18,255,235,  2,182,  0, 48,  2, 18,255,222,  2,182,  0, 82,
-  2, 18,  0, 68,  2,182,  0, 82,  2, 18,  0,174,  4,225,  0, 82,  4, 37,  0,160,  2, 43,255, 72,  2, 18,255,188,  4,162,  0,199,
-  3,248,  0,174,  3,248,  0,174,  3,238,  0,199,  2, 18,  0,171,  3,238,  0,199,  2, 18,  0,102,  3,238,  0,199,  2, 18,  0,174,
-  3,238,  0,199,  2,102,  0,174,  3,238,  0, 29,  2, 18,255,246,  5,213,  0,199,  4,182,  0,174,  5,213,  0,199,  4,182,  0,174,
-  5,213,  0,199,  4,182,  0,174,  5, 70,255,255,  5,213,  0,199,  4,182,  0,174,  5,240,  0,125,  4,158,  0,113,  5,240,  0,125,
-  4,158,  0,113,  5,240,  0,125,  4,158,  0,113,  7, 31,  0,125,  7, 72,  0,113,  4,184,  0,199,  3, 49,  0,174,  4,184,  0,199,
-  3, 49,  0, 96,  4,184,  0,199,  3, 49,  0,114,  4, 39,  0,104,  3,156,  0, 90,  4, 39,  0,104,  3,156,  0, 90,  4, 39,  0,104,
-  3,156,  0, 90,  4, 39,  0,104,  3,156,  0, 90,  4, 39,  0, 20,  2,182,  0, 33,  4, 39,  0, 20,  2,182,  0, 33,  4, 39,  0, 20,
-  2,182,  0, 33,  5,150,  0,184,  4,182,  0,164,  5,150,  0,184,  4,182,  0,164,  5,150,  0,184,  4,182,  0,164,  5,150,  0,184,
-  4,182,  0,164,  5,150,  0,184,  4,182,  0,164,  5,150,  0,184,  4,182,  0,164,  7, 18,  0, 20,  5,248,  0, 20,  4, 55,  0,  0,
-  3,233,  0, 10,  4, 55,  0,  0,  4, 80,  0, 82,  3,135,  0, 82,  4, 80,  0, 82,  3,135,  0, 82,  4, 80,  0, 82,  3,135,  0, 82,
-  2, 76,  0,174,  4,104,  0,203,  4,221,  0,  0,  4, 63,  0, 94,  6,209,255,254,  6,170,  0, 94,  5,240,  0,125,  4,158,  0,115,
-  4, 39,  0,104,  3,156,  0, 90,  4,158,  1,  2,  4,158,  1,  2,  4,117,  1, 27,  4,158,  1, 33,  2, 18,  0,160,  4,158,  1,109,
-  1,123,  0, 31,  4,158,  1,  2,  4,158,  0,223,  4,158,  1,248,  4,158,  1, 20,  4,221,255,233,  2, 37,  0,147,  4,201,255,231,
-  6, 23,255,231,  3,178,255,231,  6, 66,255,231,  5, 84,255,231,  6, 74,255,231,  2,158,255,228,  4,221,  0,  0,  4,248,  0,199,
-  3,238,  0,199,  4,139,  0, 37,  4, 57,  0,199,  4, 80,  0, 82,  5,156,  0,199,  5,240,  0,125,  2,182,  0, 82,  4,162,  0,199,
-  4,139,  0,  0,  6,246,  0,199,  5,213,  0,199,  4, 63,  0, 82,  5,240,  0,125,  5,135,  0,199,  4,156,  0,199,  4, 66,  0, 78,
-  4, 39,  0, 20,  4, 55,  0,  0,  6, 35,  0,104,  4, 96,  0,  0,  6, 35,  0,104,  5,240,  0, 78,  2,182,  0, 64,  4, 55,  0,  0,
-  4,176,  0,113,  3,160,  0, 90,  4,182,  0,174,  2,158,  0,164,  4,184,  0,164,  4,176,  0,113,  4,209,  0,174,  3,233,  0, 10,
-  4,158,  0,111,  3,160,  0, 90,  3,164,  0,113,  4,182,  0,174,  4,135,  0,113,  2,158,  0,164,  3,248,  0,174,  4, 23,255,242,
-  4,193,  0,174,  4, 35,  0,  0,  3,164,  0,113,  4,158,  0,113,  5, 10,  0, 25,  4,158,  0,164,  3,164,  0,113,  4,180,  0,113,
-  3,152,  0, 18,  4,184,  0,164,  5,150,  0,113,  4, 49,255,236,  5,236,  0,164,  6,  6,  0,113,  2,158,  0, 21,  4,184,  0,164,
-  4,158,  0,113,  4,184,  0,164,  6,  6,  0,113,  4, 57,  0,199,  5,160,  0, 20,  3,238,  0,199,  4,211,  0,125,  4, 39,  0,104,
-  2,182,  0, 82,  2,182,  0, 64,  2, 43,255, 72,  7, 72,  0,  0,  7,117,  0,199,  5,160,  0, 20,  4,162,  0,199,  4,174,  0, 25,
-  5,135,  0,199,  4,221,  0,  0,  4,156,  0,199,  4,248,  0,199,  3,238,  0,199,  5, 51,  0, 14,  4, 57,  0,199,  6,133,  0,  4,

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list