diff options
author | Andrea Weikert <elubie@gmx.net> | 2008-11-25 22:23:54 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2008-11-25 22:23:54 +0300 |
commit | 03f9b732165b9a2bc35d1b7e46411cb69d076d61 (patch) | |
tree | 72cb9b4cf7c1d65623b5aab99a7060757687d78b /source/blender/editors/interface/interface_regions.c | |
parent | 9ba909e9f9202d13f7b04e3492186886f5ab02c1 (diff) |
Bringing back icons:
Part 3/3: new icons
- Icon set done by jendrzych! Great job!
- cleaned up unnecessary includes and removed commented out code
- preview icons (for materials, textures,..) don't work yet, have to be ported to new event system
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index d2611823df7..8f2f933a946 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1721,10 +1721,13 @@ static uiBlock *test_viewmenu(wmWindow *window, uiMenuBlockHandle *handle, void void uiTestRegion(const bContext *C) { uiBlock *block; + short xco; + static float testcol[3]; static char testtext[64]; static float testnumf=5.0f; - static short testchoice= 0, testtog= 0; + static short testchoice= 0, testtog= 0, testicontog= 0; + #if 0 static CurveMapping *cumap= NULL; static ColorBand *coba= NULL; @@ -1753,6 +1756,11 @@ void uiTestRegion(const bContext *C) uiDefButF(block, COL, 3142, "", 13+50+5+80+5+100+5+100+5+200+5+150+5+100+5, 3, 100, 20, testcol, 0, 0, 0, 0 /*B_BANDCOL*/, ""); + xco = 13+50+5+80+5+100+5+100+5+200+5+150+5+100+5+100+5; + uiDefIconButBitS(block, ICONTOG, 1 /*AUTOKEY_ON*/, REDRAWINFO, ICON_PYTHON, + xco, 3, 20, 20, &testicontog, 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones"); + xco += 5; + #if 0 if(!cumap) { cumap= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f); |