diff options
author | Michael Fox <mfoxdogg@gmail.com> | 2009-03-30 12:17:43 +0400 |
---|---|---|
committer | Michael Fox <mfoxdogg@gmail.com> | 2009-03-30 12:17:43 +0400 |
commit | 78a3db7d64f5e021a9c9db2d31712f2f8dd12267 (patch) | |
tree | 4d28ebdf41838006ea88cfb6ab669888067b194a /source/blender/editors/space_buttons/space_buttons.c | |
parent | 89b906db9f758fb9642e01d9b4433b97557369fb (diff) |
2.5
*******
ported some of the scene buttons to the new system
- added RNA_SceneRenderData struct to rna
- added a warning print to uiItemR when it can't find the property
- what is not there is due to relating entry not being in RNA
- anim button does not work
Im commiting this so we have much more wider test area then text and object buttons
Diffstat (limited to 'source/blender/editors/space_buttons/space_buttons.c')
-rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index bae318ff454..61946744196 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -166,6 +166,13 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) if(tab == TAB_OBJECT_OBJECT) uiRegionPanelLayout(C, ar, vertical, "object"); } + else if (sbuts->mainb == CONTEXT_SCENE){ + int tab= sbuts->tab[CONTEXT_SCENE]; + int vertical= (sbuts->align == 2); + + if(tab == TAB_SCENE_RENDER) + uiRegionPanelLayout(C, ar, vertical, "render"); + } else { View2D *v2d= &ar->v2d; float col[3], fac; @@ -184,10 +191,7 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) glRecti(20, v2d->cur.ymin+2, 30, v2d->cur.ymin+12); /* panels */ - if(sbuts->mainb == CONTEXT_SCENE) - buttons_scene(C, ar); - else - drawnewstuff(); + drawnewstuff(); #if 0 if(sbuts->align) @@ -282,6 +286,7 @@ void ED_spacetype_buttons(void) art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES; buttons_object_register(art); + buttons_scene_register(art); BLI_addhead(&st->regiontypes, art); |