diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-21 17:24:51 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-21 17:24:51 +0300 |
commit | ce52827a0574f3c9b7054b2ddde5c8df3a9c646d (patch) | |
tree | d6f98dadc8e1c859e717e86d7bed28a47420d86a /source/blender/src/interface.c | |
parent | b33c68c906ffd6b3c5bb8c629d961037fe8c9254 (diff) |
Orange; daily noodler update commit.
- Adding execution code for Node trees. Was a bit a puzzle, since I want
it to be multithreading by design. This now is solved by defining a
stack per tree for all data that's being written into. This stack, which
resides now in the NodeTree itself, then can be allocated per thread.
- For testing pleasure, I've added a 'mix node' and a 'show node', so
you can already see it do something. :)
- reshuffled structure, to put things nice together, and have easier node
adding. Current state is still WIP though, structure might change.
For the record; new file node_shaders.c will contain all shader node
definitions, apart from the drawing callbacks.
Next: I'm going to check on Andrea's work on icons now, since this is very
much needed for true shader/composit work.
Now back to release work...
Diffstat (limited to 'source/blender/src/interface.c')
-rw-r--r-- | source/blender/src/interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index 46882423cd6..d6b4272092f 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -5198,6 +5198,8 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short but->flag |= UI_NO_HILITE; but->flag |= (block->flag & UI_BUT_ALIGN); + if(block->flag & UI_BLOCK_NO_HILITE) + but->flag |= UI_NO_HILITE; return but; } |