diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-03 14:34:28 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-03 14:34:28 +0300 |
| commit | 4bc4eac1e5c15d45a25b3586ea637a1e035f5e1e (patch) | |
| tree | 2a3f00c73e1c23b9c23f50bed6b1928482e787db /source/blender/src/headerbuttons.c | |
| parent | 85f089f3b951c110cd70f9864ba2536119d54453 (diff) | |
Orange; tweaks for further integrating node editing in UI
- Previews inside groups now get updated too
- Activating nodes inside of groups updates UI and preview render correctly
- Entering/leaving groups updates UI and previewrender
- Material Node: now draws socket name next to colorpicker for inputs
Diffstat (limited to 'source/blender/src/headerbuttons.c')
| -rw-r--r-- | source/blender/src/headerbuttons.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 9b120428c7b..f8206db0eea 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -150,6 +150,7 @@ #include "BSE_edit.h" #include "BSE_filesel.h" #include "BSE_headerbuttons.h" +#include "BSE_node.h" #include "BSE_view.h" #include "BSE_sequence.h" #include "BSE_editipo.h" @@ -723,7 +724,7 @@ void do_global_buttons(unsigned short event) else { if(G.buts->texfrom==0) { /* from mat */ ma= give_current_material(ob, ob->actcol); - ma= get_active_matlayer(ma); + ma= editnode_get_active_material(ma); if(ma) { mtex= ma->mtex[ ma->texact ]; if(mtex) { @@ -776,7 +777,7 @@ void do_global_buttons(unsigned short event) if(event==B_EXTEXBROWSE) { id= NULL; ma= give_current_material(ob, ob->actcol); - ma= get_active_matlayer(ma); + ma= editnode_get_active_material(ma); if(ma) { mtex= ma->mtex[ ma->texact ]; if(mtex) id= (ID *)mtex->tex; @@ -795,7 +796,7 @@ void do_global_buttons(unsigned short event) id= NULL; ma= give_current_material(ob, ob->actcol); - ma= get_active_matlayer(ma); + ma= editnode_get_active_material(ma); if(ma) { mtex= ma->mtex[ ma->texact ]; if(mtex) id= (ID *)mtex->tex; @@ -1713,7 +1714,7 @@ void do_global_buttons2(short event) if(G.buts->texfrom==0) { /* from mat */ if(ob==0) return; ma= give_current_material(ob, ob->actcol); - ma= get_active_matlayer(ma); + ma= editnode_get_active_material(ma); if(ma && ma->id.lib==0) { mtex= ma->mtex[ ma->texact ]; if(mtex->tex && mtex->tex->id.us>1) { @@ -1754,7 +1755,7 @@ void do_global_buttons2(short event) if(G.buts->texfrom==0) { /* from mat */ if(ob==0) return; ma= give_current_material(ob, ob->actcol); - ma= get_active_matlayer(ma); + ma= editnode_get_active_material(ma); if(ma && ma->id.lib==0) { mtex= ma->mtex[ ma->texact ]; if(mtex->tex && mtex->tex->id.lib) { |