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
This commit is contained in:
@@ -71,7 +71,9 @@
|
||||
#include "BKE_node.h"
|
||||
#include "BKE_texture.h"
|
||||
#include "BKE_utildefines.h"
|
||||
|
||||
#include "BSE_drawipo.h"
|
||||
#include "BSE_node.h"
|
||||
#include "BSE_headerbuttons.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
@@ -286,13 +288,14 @@ void buttons_active_id(ID **id, ID **idfrom)
|
||||
|
||||
ma= give_current_material(ob, ob->actcol);
|
||||
if(ma && ma->use_nodes)
|
||||
node= nodeGetActiveID(ma->nodetree, ID_TE);
|
||||
node= editnode_get_active_idnode(ma->nodetree, ID_TE);
|
||||
|
||||
if(node) {
|
||||
*idfrom= NULL;
|
||||
*id= node->id;
|
||||
}
|
||||
else {
|
||||
ma= get_active_matlayer(ma);
|
||||
ma= editnode_get_active_material(ma);
|
||||
*idfrom= (ID *)ma;
|
||||
if(ma) {
|
||||
mtex= ma->mtex[ ma->texact ];
|
||||
|
||||
Reference in New Issue
Block a user