merge from 23153 to 23595 soc-2009-imbusy
authorLukas Steiblys <imbusy@imbusy.org>
Thu, 1 Oct 2009 22:29:15 +0000 (22:29 +0000)
committerLukas Steiblys <imbusy@imbusy.org>
Thu, 1 Oct 2009 22:29:15 +0000 (22:29 +0000)
1  2 
config/win64-vc-config.py
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/gpu/BL_gpu.vcproj
release/scripts/ui/space_userpref.py
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c

Simple merge
index 51103efe20b11c9f9b8e801f087d2d6879502914,d7c1622904955e2cf3e1dd44f5b02bf6aee6e520..002e2b6a7c5017df9132101bca6e2f0eb0b2603d
@@@ -1,7 -1,8 +1,8 @@@
  Microsoft Visual Studio Solution File, Format Version 10.00\r
 -# Visual Studio 2008\r
 +# Visual C++ Express 2008\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj", "{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {02110D03-59DB-4571-8787-72B3C03B2F2D} = {02110D03-59DB-4571-8787-72B3C03B2F2D}\r
                {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F} = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}\r
                {6E24BF09-9653-4166-A871-F65CC9E98A9B} = {6E24BF09-9653-4166-A871-F65CC9E98A9B}\r
                {A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9}\r
Simple merge
index 37cd424ac18c6c42a3cbf66f4d3bc93ae27c4506,486a887b3548033a5d9a44f8e5c634227ff8807c..2c124437eb2554bd496f2a538e5b2a87c88f1008
@@@ -1869,18 -2068,19 +2068,20 @@@ static void WM_OT_redraw_timer(wmOperat
  {
        static EnumPropertyItem prop_type_items[] = {
        {0, "DRAW", 0, "Draw Region", ""},
-       {1, "DRAWSWAP", 0, "Draw Region + Swap", ""},
-       {2, "DRAWWINSWAP", 0, "Draw Window + Swap", ""},
-       {3, "ANIMSTEP", 0, "Anim Step", ""},
-       {4, "UNDO", 0, "Undo/Redo", ""},
+       {1, "DRAW_SWAP", 0, "Draw Region + Swap", ""},
+       {2, "DRAW_WIN", 0, "Draw Window", ""},
+       {3, "DRAW_WIN_SWAP", 0, "Draw Window + Swap", ""},
+       {4, "ANIM_STEP", 0, "Anim Step", ""},
+       {5, "UNDO", 0, "Undo/Redo", ""},
        {0, NULL, 0, NULL, NULL}};
        
-       ot->name= "Ten Timer";
-       ot->idname= "WM_OT_ten_timer";
+       ot->name= "Redraw Timer";
+       ot->idname= "WM_OT_redraw_timer";
+       ot->description="Simple redraw timer to test the speed of updating the interface.";
 +      ot->description="Ten Timer operator.";
        
        ot->invoke= WM_menu_invoke;
-       ot->exec= ten_timer_exec;
+       ot->exec= redraw_timer_exec;
        ot->poll= WM_operator_winactive;
        
        RNA_def_enum(ot->srna, "type", prop_type_items, 0, "Type", "");