[Bf-blender-cvs] [47bc66f] master: Note Editor: Auto-offset nodes on insertion
Julian Eisel
noreply at git.blender.org
Sat Aug 1 18:00:46 CEST 2015
Commit: 47bc66fc8dfe2b89e2b5be029c63f9043c8c2174
Author: Julian Eisel
Date: Sat Aug 1 17:39:48 2015 +0200
Branches: master
https://developer.blender.org/rB47bc66fc8dfe2b89e2b5be029c63f9043c8c2174
Note Editor: Auto-offset nodes on insertion
Implements "Auto-offset" (called "insert offset" in code) feature for Node Editor, developed during and after LSOC :)
Idea and sponsoring by Sebastian König, blendFX, Mathias Eimann, Mikavaa, Knick Design
When you drop a node with at least one input and one output socket onto a an existing connection between two nodes, Auto-offset will, depending on the direction setting, automatically and animated move the left or right and all of its following nodes away to make room for the new node.
The direction for offsetting can be toggled while you are moving the node by pressing „T“.
The auto-offset is enabled by default but can be disabled in the header of the node-editor. The offset margin can be changed in the editing section of the User Preferences.
Thanks a lot to the sponsors, and especially to Sebastian who helped *a lot* with this. That's how users can help developing Blender!
===================================================================
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_node_insert_off.dat
A release/datafiles/blender_icons16/icon16_node_insert_on.dat
A release/datafiles/blender_icons32/icon32_node_insert_off.dat
A release/datafiles/blender_icons32/icon32_node_insert_on.dat
M release/scripts/startup/bl_operators/node.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/resources.c
M source/blender/editors/space_node/node_intern.h
M source/blender/editors/space_node/node_ops.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/transform/transform.c
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index a66bad3..94784a7 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -30320,6 +30320,434 @@
stdDeviation="0.25149387"
id="feGaussianBlur17891" />
</filter>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath15455">
+ <rect
+ style="color:#000000;fill:#d8d8d8;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ id="rect15457"
+ width="16"
+ height="16"
+ x="301.96045"
+ y="236.91833" />
+ </clipPath>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask15700">
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter15613);enable-background:new"
+ d="m 302.9292,245.91834 -2.4375,-1.125 -0.53125,-9.84375 19.95312,-0.0469 0.0156,9.95313 -2.9375,1.09375 0,5.96875 -14,0 z"
+ id="path15702"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ </mask>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter15613"
+ x="-0.092011765"
+ width="1.1840235"
+ y="-0.097762503"
+ height="1.1955251">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.65175"
+ id="feGaussianBlur15615" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient37542-55"
+ id="linearGradient15678"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6025789,0,0,0.668336,262.51944,86.612922)"
+ x1="49.543404"
+ y1="230.81766"
+ x2="73.932747"
+ y2="247.27646" />
+ <linearGradient
+ id="linearGradient37542-55">
+ <stop
+ id="stop37544-61"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop37546-03"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-74"
+ id="linearGradient15680"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9120445,0,0,1,24.780995,9.8636515)"
+ x1="305.12527"
+ y1="239.03134"
+ x2="308.97327"
+ y2="242" />
+ <linearGradient
+ id="linearGradient319-74">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop320-42" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop321-67" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient37542-55"
+ id="linearGradient15682"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.584271,0,0,0.661005,267.80323,78.438648)"
+ x1="51.682816"
+ y1="229.19724"
+ x2="73.932762"
+ y2="247.35141" />
+ <linearGradient
+ id="linearGradient14195">
+ <stop
+ id="stop14197"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop14199"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-74"
+ id="linearGradient15684"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9103441,0,0,0.989031,29.299938,2.5312404)"
+ x1="305.12527"
+ y1="239.03134"
+ x2="307.25021"
+ y2="241.62509" />
+ <linearGradient
+ id="linearGradient14202">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop14204" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop14206" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient21609-6"
+ id="linearGradient15688"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6025789,0,0,0.668336,273.45693,86.644181)"
+ x1="49.543404"
+ y1="230.81766"
+ x2="73.932747"
+ y2="247.27646" />
+ <linearGradient
+ id="linearGradient21609-6">
+ <stop
+ id="stop21611-3"
+ offset="0"
+ style="stop-color:black;stop-opacity:1" />
+ <stop
+ id="stop21613-0"
+ offset="1"
+ style="stop-color:white;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient29312-0"
+ id="linearGradient15690"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9120445,0,0,1,35.718484,9.8949108)"
+ x1="305.12527"
+ y1="239.03134"
+ x2="308.97327"
+ y2="242" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient29312-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop29314-8" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop29316-3" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient16019"
+ id="linearGradient15692"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.59375,1.375)"
+ x1="308.85309"
+ y1="245.43437"
+ x2="314.06238"
+ y2="245.43437" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient16019">
+ <stop
+ style="stop-color:#c6d7ef;stop-opacity:1"
+ offset="0"
+ id="stop16021" />
+ <stop
+ style="stop-color:#7fa4dc;stop-opacity:1"
+ offset="1"
+ id="stop16023" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15996"
+ id="linearGradient15694"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.59375,1.375)"
+ x1="304.86005"
+ y1="245.47992"
+ x2="310.04089"
+ y2="245.47992" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient15996">
+ <stop
+ style="stop-color:#5f8dd3;stop-opacity:1"
+ offset="0"
+ id="stop15998" />
+ <stop
+ style="stop-color:#d7e3f4;stop-opacity:1"
+ offset="1"
+ id="stop16000" />
+ </linearGradient>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath15455-9">
+ <rect
+ style="color:#000000;fill:#d8d8d8;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ id="rect15457-6"
+ width="16"
+ height="16"
+ x="301.96045"
+ y="236.91833" />
+ </clipPath>
+ <mask
+ maskUnits="userSpaceOnUse"
+ id="mask15700-4">
+ <path
+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.20000005000000010;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter15613-8);enable-background:new"
+ d="m 302.9292,245.91834 -2.4375,-1.125 -0.53125,-9.84375 19.95312,-0.0469 0.0156,9.95313 -2.9375,1.09375 0,5.96875 -14,0 z"
+ id="path15702-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ </mask>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:collect="always"
+ id="filter15613-8"
+ x="-0.092011765"
+ width="1.1840235"
+ y="-0.097762503"
+ height="1.1955251">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.65175"
+ id="feGaussianBlur15615-1" />
+ </filter>
+ <filter
+ color-interpolation-filters="sRGB"
+ inkscape:label="Greyscale"
+ id="filter15388">
+ <feColorMatrix
+ values="0.21 0.72 0.072 0 0 0.21 0.72 0.072 0 0 0.21 0.72 0.072 0 0 0 0 0 1 0 "
+ id="feColorMatrix15390"
+ result="fbSourceGraphic" />
+ <feColorMatrix
+ result="fbSourceGraphicAlpha"
+ in="fbSourceGraphic"
+ values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+ id="feColorMatrix15392" />
+ <feColorMatrix
+ id="feColorMatrix15394"
+ values="0.21 0.72 0.072 0 0 0.21 0.72 0.072 0 0 0.21 0.72 0.072 0 0 0 0 0 1 0 "
+ in="fbSourceGraphic" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient37542-91"
+ id="linearGradient15371"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6025789,0,0,0.668336,262.51944,86.612922)"
+ x1="49.543404"
+ y1="230.81766"
+ x2="73.932747"
+ y2="247.27646" />
+ <linearGradient
+ id="linearGradient37542-91">
+ <stop
+ id="stop37544-81"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop37546-75"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-223"
+ id="linearGradient15373"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9120445,0,0,1,24.780995,9.8636515)"
+ x1="305.12527"
+ y1="239.03134"
+ x2="308.97327"
+ y2="242" />
+ <linearGradient
+ id="linearGradient319-223">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop320-84" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop321-34" />
+ </linearGradient>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list