Blender Git Loki

quiet some warnings from recent merge

Fixed possible issue drawing undistorted clip in clip editor.
Check for marker's visibility was a bit odd.

Restored GPL header of NOD_composite.h (funny s&r ?!?).

Camera tracking integration: more code cleanup

Camera tracking integration: cleanup and finish some parts of recent commit

- Replace set of booleans with menu, so now you'll simply be unable to choose
unsupported refine combination
- Some internal code cleanup and minor refactor

Whitespace tweaks

Dynamic Paint merge:
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.

End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint

GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint

Workaround #29205: Crash while using Edge Split modifier (while rotating vertices in edit mode with edge split viewable)

This bug is caused by exactly the same reason as #26316: differences in how new vertices/edges
are getting calculated first and how they're adding later. In some cases extra vertices are
creating which weren't counted before.

This patch prevents crash in such situations, but result mesh can be a bit wrong.
This should work fine in bmesh, so think it's acceptable to have such workaround
before actual fix coming with bmesh.

- possible fix for vertex paint 'fill' crash.
- remove unneeded call to defvert_find_index() when weight painting.

add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without.

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

quiet warning

presets now work from non-redo popups,

ended up having to add a new pointer into the uiBlock (which I'd rather have avoided), but setting the uiLayoutSetContextPointer(..) was complicated to properly use for submenus and popus.

fix compile errors for previous merge

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

While reviewing this part of the code for a Blender Proceedings article, I noticed that the lock enforcer was taking several improper steps to redistribute evenly with multi-paint.

Beforehand, a few problems were in view: some of the indexing was changed towards the end to use the more efficient stack structure, but needed to use the correct def group indices.

Also, the designated selected group would use its own value to acquire the standard to base change distributed to the others.

Lastly, the total_change was used rather than -left_overs in the formula to compute the new designated weight within the means of the locks' allowed changes.


Now, while maintaining the ratios of the selection, it correctly returns left over change that could not be redistributed to the unlocked groups.

svn merge -r41649:41650 ^/trunk/blender

svn merge -r41638:41648 ^/trunk/blender

One library from OpenEXR is needed for oiio. Hope buildbot is working fine now.

Disable libmv for blenderplayer rules used by buildbot