blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Increase node max width to 700px 

Opened and collapsed nodes now have a max width of 700px. Animation nodes add-on needs this.
This commit is contained in:
Julian Eisel 2016-03-12 19:10:36 +01:00
parent 681becb359
commit 989b0e472e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/node.c
View File

@ -72,6 +72,8 @@
#include "NOD_shader.h"
#include "NOD_texture.h"
#define NODE_DEFAULT_MAX_WIDTH 700
/* Fallback types for undefined tree, nodes, sockets */
bNodeTreeType NodeTreeTypeUndefined;
bNodeType NodeTypeUndefined;
@ -3423,16 +3425,16 @@ void node_type_size_preset(struct bNodeType *ntype, eNodeSizePreset size)
{
switch (size) {
case NODE_SIZE_DEFAULT:
node_type_size(ntype, 140, 100, 320);
node_type_size(ntype, 140, 100, NODE_DEFAULT_MAX_WIDTH);
break;
case NODE_SIZE_SMALL:
node_type_size(ntype, 100, 80, 320);
node_type_size(ntype, 100, 80, NODE_DEFAULT_MAX_WIDTH);
break;
case NODE_SIZE_MIDDLE:
node_type_size(ntype, 150, 120, 320);
node_type_size(ntype, 150, 120, NODE_DEFAULT_MAX_WIDTH);
break;
case NODE_SIZE_LARGE:
node_type_size(ntype, 240, 140, 320);
node_type_size(ntype, 240, 140, NODE_DEFAULT_MAX_WIDTH);
break;
}
}

3
source/blender/editors/space_node/node_edit.c
View File

@ -924,14 +924,13 @@ static int node_resize_modal(bContext *C, wmOperator *op, const wmEvent *event)
pwidth = &node->miniwidth;
oldwidth = nsw->oldminiwidth;
widthmin = 0.0f;
widthmax = 100.0f;
}
else {
pwidth = &node->width;
oldwidth = nsw->oldwidth;
widthmin = node->typeinfo->minwidth;
widthmax = node->typeinfo->maxwidth;
}
widthmax = node->typeinfo->maxwidth;
{
if (nsw->directions & NODE_RESIZE_RIGHT) {