Blender Git Loki

speedup to inpaint node in my tests was about ~30% for an optimized build.

also replace MIN/MAX2 with inline functions in transform.

Merging r49635 through r49638 from trunk into soc-2011-tomato

Fix for drawing arrows on node lines between two reroute nodes. This was a typo in r48762 which inverted the arrow scale.

svn merge ^/trunk/blender -r49628:49634

remove unused mask pointer

Switching images in the image space would modify UV coordinates.


This is an intended feature but works too unreliably.

- This setting was stored in each face and only editable by re-running the unwrap, this is too hidden (only discovered this by reading code).
- This worked with blender internal but not with cycles, such basic options as changing an image shouldn't behave different depending on the render engine selected.

I've ifdef'd out the aspect correction for now, it could be added back as a per scene option and be made to run on both cycles or blender internal but for now I prefer to keep this disabled.

Adding "inpaint" as allowed words...

Tile fix: Use the validity flag in node links directly instead of the indirect node level check for cyclic links to avoid crash in cases of invalid links, which can be created in some situations (reroute nodes). The link flag may have been set by additional constraints. It is much simpler to use and avoids the redundant check.

Fix for incomplete Reroute node updates. Adding reroute nodes by spliting links would often result in unrelated color sockets or otherwise miss updates.

The reason is that the per-node updates used for Reroute node type inheritance are not supposed to be looking at connected nodes, they are purely for "local" updates. For this sort of "global" update which requires depth-first search, the update function on the node tree level must be used instead.

Merging r49624 through r49628 from trunk into soc-2011-tomato

Fix for Reroute nodes: Reloading could change socket types without updating the socket data structs, leading to crash. This is caused by the node verification procedure, which resets any socket type to the initial type defined in the socket templates. Adding sockets dynamically without templates solves this (the sockets are then ignored by verification).

bring back the play option from 2.4x

missed this when merging inpaint

fix for memory leak playing animations.

Merging r49622 through r49623 from trunk into soc-2011-tomato

Made feather self-intersection check an option.
Useful in cases when masking stuff like self-intersecting
ropes. This could probably be smarter option, but can't
currently think about robust approach here.

fix for bge module imports so you can do for eg:

import bge.render as render

svn merge ^/trunk/blender -r49601:49620

misc small edits syncing with trunk

Mask feather self-intersection check

Enable self-intersection check for preview. In own tests average
time for this operation on mango files was ~0.0015sec, and it was
like 20 splines max which still gives pretty smooth performance
on my core quad machine.

Would think let's check how it works for now, if it'll give some
issues here, would just avoid tessellation on every redraw by
storing tessellation in some cache (probably in mask user).

Another change is related on a way which loop to collapse.
Changed length check with AABB size check. A bit slower but
should be a bit more predictable.