diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-03-12 21:10:36 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-03-12 21:12:32 +0300 |
| commit | 989b0e472e74869be9f170e2dafbae76d6a4ce94 (patch) | |
| tree | 24f286f5aba2d651f52e5a8e67226fc39c5560e3 /source/blender | |
| parent | 681becb3592d48a582d962b56f8ce73246060326 (diff) | |
Increase node max width to 700px
Opened and collapsed nodes now have a max width of 700px. Animation nodes add-on needs this.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index bc8a7d97a09..75f899dd597 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -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; } } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 62431b30b2e..6ae72e2a164 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -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) { |