0383fb5341
svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-11 08:28:16 +00:00
5fdbfbaf3a
replace magic numbers for flags for uiSetRoundBox();
2011-09-11 06:41:09 +00:00
599cd56f53
minor edits / cleanup - no functional changes.
...
- use 'const float *' and array size in some function declarations.
- replace macros for BLI_math functions INPF, VECCOPY, VECADD etc.
- remove unused VertRen.clip struct member.
- remove static squared_dist() from 2 files, replace with BLI_math function len_squared_v3v3().
- use vertex arrays for drawing clipping background in the 3D viewport.
2011-09-11 02:50:01 +00:00
61b6fcd804
svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:29:49 +00:00
Lukas Toenne
595ed90fe3
Minor fixes for some unfounded clang warnings.
2011-09-08 07:01:29 +00:00
Lukas Toenne
c00eba13e0
Node comparison function for sort order did not take parent selection into account.
2011-09-07 15:11:36 +00:00
Lukas Toenne
3f565fc212
Updating render layer and image output sockets was not working due to changes in snode_set_context. Before the r39941 this used a hack to 'test for first drawing', but since the snode->nodetree was set to NULL each time at the start of that function the condition would always evaluate true anyway. Simply removed that check to restore previous behavior.
2011-09-07 13:30:16 +00:00
Lukas Toenne
fcbf3041a9
Fixed offset for socket remove buttons ('x') in node groups.
2011-09-07 10:48:33 +00:00
a167ee1262
svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 00:46:11 +00:00
Lukas Toenne
f2e236e312
Enabled the 'Layout' node category, currently only containing the 'Frame' node. Both the category and the node could be renamed as needed. The frame node is largely experimental and not totally useful yet, but much asked for, so can't hurt to let people try it out.
2011-09-06 17:28:26 +00:00
Lukas Toenne
71abf218f0
Fix for wrong offset of the input socket column in group node tree display.
2011-09-06 11:42:20 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
0991bed413
fix some complier warnings and add -Wundef to CMake's default GCC warnings.
2011-09-05 23:40:52 +00:00
Lukas Toenne
8e0fe8bff7
Merged the particles-2010 branch with node improvements into trunk.
...
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:
http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
8e232af37c
svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-03 02:49:21 +00:00
00143a3d55
spaces -> tabs (configure you're editors right!)
2011-09-01 01:48:50 +00:00
5065d4c744
svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-29 00:46:56 +00:00
5f66f37e22
Patch for bug #28289
...
updated the logic behind node delete with reconnect.
When on input and output socket is connected, these two will be reconnected
see bug report for example.
http://projects.blender.org/tracker/?func=detail&aid=28289&group_id=9&atid=498
2011-08-24 20:48:37 +00:00
fd4575b2e3
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-24 02:29:45 +00:00
98f87b77f4
svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-24 01:44:54 +00:00
36f20f162c
Fix #28154 : linux3-config.py doesn't exist
...
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/
Tested on both of linux2 and linux3 systems.
2011-08-21 13:31:46 +00:00
4427c14683
Small fix, report in IRC by Olivier:
...
Click in Compositor on output node invoked a re-composite.
Only has to be done for inactive outputs.
2011-08-21 13:25:19 +00:00
b4df54151a
2.6 Node Muting:
...
* Removing check if Node is in between, so in-/output nodes can be muted as well. Useful for example if you want to temporarily mute a file output node.
2011-08-16 08:40:25 +00:00
74ca6070b4
svn merge -r39384:39433 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-16 06:53:03 +00:00
55a560c0c4
svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-16 06:30:14 +00:00
ae884d2e54
Code cleanup: add UNUSED_FUNCTION macro to avoid warning messages about unused
...
functions.
2011-08-15 16:18:04 +00:00
a7dd264940
Nodes: make node set active function usable outside of node editor, and in doing
...
so fix a missing updating when activating a node with multiple node editors open.
2011-08-12 18:27:48 +00:00
aa1477cce1
https://svn.blender.org/svnroot/bf-blender/trunk/blender , in sync with trunk now
2011-08-05 08:28:03 +00:00
5c26223106
svn merge -r38804:38971 https://svn.blender.org/svnroot/bf-blender/trunk/blender , manual merge of source/blender/editors/transform/transform.c
2011-08-05 08:02:04 +00:00
9da70f74d3
UserPref/Node editor feature: Change the level of noodle curving.
...
Some people like curved lines, other hate them. This commit will let the user change the level of curving.
In UserPreferences=>Themes=>Node editor=>Noodle curving the level can be modified. Allowed range is 0-10 with the default on 5
The patch will default everything to the way blender works ATM.
File subversion has been increased otherwise older 258 files got straight lines.
The data is stored in the ThemeSpace.noodle_curving
the bezierdrawing is done in the drawnode. Also tested the Line cut tool
2011-08-04 10:05:14 +00:00
Lukas Toenne
fb738f4929
When relinking node group outputs from sockets of different type, automatically change the output to the source type. Feature request by Daniel Salazar.
2011-07-29 07:14:03 +00:00
73dde4e26f
svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-29 02:03:53 +00:00
7e466266d3
fix [ #28098 ] Continuous Grab does not work for movement of the "Backdrop" in the Node Editor
2011-07-27 17:49:35 +00:00
48a64ffa70
more minor warning cleanups and improve error reporting if text fails to save.
2011-07-27 06:55:20 +00:00
42b87af8a7
svn merge -r38600:38700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 04:31:59 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
ac2dd40991
svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:14:16 +00:00
cadfac5a0f
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 17:51:30 +00:00
cc0abf9963
svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 16:12:54 +00:00
b709b52f46
svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-24 13:21:54 +00:00
97d0846d2c
svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-24 13:03:48 +00:00
ffc490cbf1
Two fixes in drop-node-on-noodle:
...
- Intersection code was using undefined vector
caused wrong lines to be picked
- Code now also copes with hidden sockets.
If all fails, is just unhides a good socket.
2011-07-22 16:39:06 +00:00
eed7702c99
Small fix in drop-node-on-noodle: intersect code only did 3 edges of
...
node.
2011-07-22 16:02:56 +00:00
ea90544d65
Need some fun once a while:
...
On dragging a non-connected node on a noodle, it will insert it.
Functionality tweaks are possible, but it already feels non-intrusive.
Rules:
- Insertion only when a single noodle is intersecting with node.
- Default connects first matching socket type.
- If no socket match, it connects the first.
2011-07-22 15:28:50 +00:00
Lukas Toenne
cf83cabb10
Modified behavior when replacing input links: The new target socket for the existing link is now chosen from available sockets that match the _target_ type, instead of the source type. This leads to more usable replacements, e.g. for toggling inputs on mix nodes. Still not a great solution to the mute/autoconnect problem, but a bit more intuitive for replacements.
2011-07-17 19:43:14 +00:00
Lukas Toenne
f62df587d9
Changed the default keys for duplicate-nodes-while-keeping-input-links to ctrl+shift+dkey, to avoid conflicts with alt+dkey for linked duplicates.
2011-07-17 18:17:35 +00:00
Lukas Toenne
756ef16e21
Little modification of the duplicate operator on artist request: The default behavior (shift+dkey) is now to copy nodes and internal links, but not the input links from unselected nodes. This feature is available with the alternate duplicate operator (alt+dkey).
2011-07-17 18:04:28 +00:00
Lukas Toenne
b29b0acdce
Removed the autoconnect call when adding new nodes, this hardly ever gives usable results and leads to annoyed artists.
2011-07-17 16:14:52 +00:00
5792bd7cc7
cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
2011-07-17 09:11:13 +00:00
c9ad903af2
Added notifier listener for node editor.
...
Now it behaves right on playback:
- Starting playback "Anim Player" button appears on header.
It used to appear only on mouse hover before.
- Stopping playback triggers refresh on compositor, so
actual result would be visible if image sequence/movie
is used in nodes.
2011-07-17 08:38:04 +00:00
