Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2009-02-11 19:54:55 +0300
committerTon Roosendaal <ton@blender.org>2009-02-11 19:54:55 +0300
commit2e79e4e9751aa44da905fb0646d8b9b8b4f9d825 (patch)
treeca7ee580f9c3a6b31b5a0237c0136f5c089d6c5c /source/blender/editors/interface/interface.c
parentf3c67b070fc6baa18cd84aee26170d8ac6ee98ab (diff)
2.5
Smaller jobs, all in one commit! - Moved object_do_update out of view3d drawing, into the event system (currently after notifiers). Depsgraph calls for setting update flags will have to keep track of each Screen's needs, so a UI showing only a Sequencer doesn't do objects. - Added button in "Properties region" in 3D window to set or disable 4-split, including the 3 options it has. (lock, box, clip) - Restored legacy code for UI, to make things work like bone rename, autocomplete. - Node editor now shows Curves widgets again - Bugfix: composite job increased Viewer user id count - Bugfix: Node editor, not "Enable nodes" still called a Job, which didn't do anything - Various code cleaning, unused vars and prototypes.
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r--source/blender/editors/interface/interface.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index a2f272767cb..c2c15a4cd5c 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -624,6 +624,7 @@ void uiEndBlock(const bContext *C, uiBlock *block)
void uiDrawBlock(const bContext *C, uiBlock *block)
{
+ ARegion *ar= CTX_wm_region(C);
uiBut *but;
if(!block->endblock)
@@ -640,7 +641,7 @@ void uiDrawBlock(const bContext *C, uiBlock *block)
if(block->drawextra) block->drawextra(C, block);
for (but= block->buttons.first; but; but= but->next)
- ui_draw_but(but);
+ ui_draw_but(ar, but);
ui_draw_links(block);
}
@@ -863,11 +864,11 @@ static int ui_do_but_LINK(uiBlock *block, uiBut *but)
bt= ui_get_valid_link_button(block, but, mval);
if(bt) {
bt->flag |= UI_ACTIVE;
- ui_draw_but(bt);
+ ui_draw_but(ar, bt);
}
if(bto && bto!=bt) {
bto->flag &= ~UI_ACTIVE;
- ui_draw_but(bto);
+ ui_draw_but(ar, bto);
}
bto= bt;
@@ -965,7 +966,7 @@ static void edit_but(uiBlock *block, uiBut *but, uiEvent *uevent)
but->x2 += dx;
but->y2 += dy;
- ui_draw_but(but);
+ ui_draw_but(ar, but);
ui_block_flush_back(but->block);
didit= 1;