← Back to branch summary

~diresu/blender/blender-command-port-002

« back to all changes in this revision

Viewing changes to source/blender/editors/interface/resources.c

  • Committer: Dietrich Bollmann
  • Date: 2010-07-23 08:21:44 UTC
  • mfrom: (15474.1.5025)
  • Revision ID: dietrich@formgames.org-20100723082144-24nrn8oku0115pwh
Update to state of blender repository from 2010-07-23 revision 30644.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/interface/resources.c
309
309
                                cp= ts->nurb_sel_vline; break;
310
310
                        case TH_ACTIVE_SPLINE:
311
311
                                cp= ts->act_spline; break;
 
312
                        case TH_LASTSEL_POINT:
 
313
                                cp= ts->lastsel_point; break;
312
314
                        case TH_HANDLE_FREE:
313
315
                                cp= ts->handle_free; break;
314
316
                        case TH_HANDLE_AUTO:
530
532
        SETCOL(btheme->tv3d.handle_sel_align, 0xf0, 0x90, 0xa0, 255);
531
533
 
532
534
        SETCOL(btheme->tv3d.act_spline, 0xdb, 0x25, 0x12, 255);
 
535
        SETCOL(btheme->tv3d.lastsel_point,  0xff, 0xff, 0xff, 255);
533
536
 
534
537
        SETCOL(btheme->tv3d.bone_solid, 200, 200, 200, 255);
535
538
        SETCOL(btheme->tv3d.bone_pose, 80, 200, 255, 80);               // alpha 80 is not meant editable, used for wire+action draw
996
999
        }
997
1000
        if (U.savetime <= 0) {
998
1001
                U.savetime = 1;
999
 
// XXX          error(".B.blend is buggy, please consider removing it.\n");
 
1002
// XXX          error("startup.blend is buggy, please consider removing it.\n");
1000
1003
        }
1001
1004
        /* transform widget settings */
1002
1005
        if(U.tw_hotspot==0) {
1135
1138
                }
1136
1139
                
1137
1140
                /* set defaults for 3D View rotating axis indicator */ 
1138
 
                /* since size can't be set to 0, this indicates it's not saved in .B.blend */
 
1141
                /* since size can't be set to 0, this indicates it's not saved in startup.blend */
1139
1142
                if (U.rvisize == 0) {
1140
1143
                        U.rvisize = 15;
1141
1144
                        U.rvibright = 8;
1451
1454
                        SETCOLF(btheme->tv3d.edge_crease, 0.8, 0, 0.6, 1.0);
1452
1455
                }
1453
1456
        }
 
1457
        if (G.main->versionfile <= 252) {
 
1458
                bTheme *btheme;
1454
1459
 
 
1460
                /* init new curve colors */
 
1461
                for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 
1462
                        if (btheme->tv3d.lastsel_point[3] == 0)
 
1463
                                SETCOL(btheme->tv3d.lastsel_point, 0xff, 0xff, 0xff, 255);
 
1464
                }
 
1465
        }
 
1466
        if (G.main->versionfile < 252 || (G.main->versionfile == 252 && G.main->subversionfile < 5)) {
 
1467
                bTheme *btheme;
 
1468
                
 
1469
                /* interface_widgets.c */
 
1470
                struct uiWidgetColors wcol_progress= {
 
1471
                        {0, 0, 0, 255},
 
1472
                        {190, 190, 190, 255},
 
1473
                        {100, 100, 100, 180},
 
1474
                        {68, 68, 68, 255},
 
1475
                        
 
1476
                        {0, 0, 0, 255},
 
1477
                        {255, 255, 255, 255},
 
1478
                        
 
1479
                        0,
 
1480
                        5, -5
 
1481
                };
 
1482
                
 
1483
                for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 
1484
                        /* init progress bar theme */
 
1485
                        btheme->tui.wcol_progress= wcol_progress;
 
1486
                }
 
1487
        }
1455
1488
        
1456
1489
        /* GL Texture Garbage Collection (variable abused above!) */
1457
1490
        if (U.textimeout == 0) {
1477
1510
        if (U.v2d_min_gridsize == 0) {
1478
1511
                U.v2d_min_gridsize= 35;
1479
1512
        }
 
1513
        
 
1514
        /* Single Column UI Value */
 
1515
        if (U.propwidth == 0) {
 
1516
                U.propwidth = 200;
 
1517
        }
1480
1518
 
1481
1519
        /* funny name, but it is GE stuff, moves userdef stuff to engine */
1482
1520
// XXX  space_set_commmandline_options();
1484
1522
// XXX  reset_autosave();
1485
1523
 
1486
1524
}
1487
 
 
1488
 
 
1489