diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-11-27 20:58:46 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-11-27 20:58:46 +0300 |
| commit | 963b1f7f073e09fb04f29de55c5c698cc4e3cd57 (patch) | |
| tree | 40e96d6073f5dc349378ae7a678197dac733d7df /source/blender/editors/space_time | |
| parent | d6aff38426a29af19230ee5badbda47ff4c0a306 (diff) | |
Bugfix: loading a .blend (via commandline now) while current config
had more windows, it left the non-active windows empty. The window-match
code is unfinished (need to bring all editors back), for now it just
follows rule to copy active screen in loaded file to other windows.
Also: added time marker icons (wrong location, view2d stuff still)
Also: bug in random green/purple area code, stopped at 10 subwindows :)
Diffstat (limited to 'source/blender/editors/space_time')
| -rw-r--r-- | source/blender/editors/space_time/ed_markers.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_time/ed_markers.c b/source/blender/editors/space_time/ed_markers.c index 54e4ab6d360..5c9b7bd0685 100644 --- a/source/blender/editors/space_time/ed_markers.c +++ b/source/blender/editors/space_time/ed_markers.c @@ -50,6 +50,7 @@ #include "BIF_glutil.h" #include "UI_interface.h" +#include "UI_interface_icons.h" #include "UI_view2d.h" #include "UI_resources.h" @@ -104,9 +105,7 @@ static void draw_marker(View2D *v2d, TimeMarker *marker, int cfra, int flag) ICON_MARKER; } - //BIF_icon_draw(xpos*xscale-5.0, 12.0, icon_id); - glColor3ub(0, 100, 0); - glRectf(xpos*xscale-5.0f, 12.0f, xpos*xscale, 17.0f); + UI_icon_draw(xpos*xscale-5.0, 12.0, icon_id); glBlendFunc(GL_ONE, GL_ZERO); glDisable(GL_BLEND); |