Blender Git Loki

Merged changes in the trunk up to revision 41368.

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c

svn merge -r41335:41371

Fix for #29087: Meshs with non-planar polys added from py scripts show boundaries between tesselated triangles of a single poly

Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)

* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)

Fix RelWithDebInfo build.

RelWithDebInfo sets the library path to only include release libraries (e.g. python32.lib) but defining _DEBUG when #include'ing python headers inserts a linker directive to require for python32_d.lib. Additionally, RelWithDebInfo should be different from release build in that it builds debugger symbols (.PDBs), it should not have asserts and other debug code.

Merged changes in the trunk up to revision 41225.

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Cycles: seed value to get different noise values from renders, there was a patch
for this but I've implemented it differently.

Cycles: fix blenderplayer build error.

Fix for #29080: vertex paint mask doesn't work

Camera tracking integration
===========================

- Fixed jump when sliding movie clip with lock to selection enabled and nothing selected.
- Reset offset from locked position when adding new marker.

style edits
- rename var to match trunk shape key code
- reduce scope of some vars
- comment some unused vars

bug from revision 2!, error noticed kjym3 on IRC, buffer overrun on lbarray, was 30 but 39 items beting accessed, surprising this didnt crash earlier.

Camera tracking integration
===========================

Fixed crash when trying to track from frame where there's no
keyframed markers to use for keyframed tracking
(i.e. when you've tracked forwards, then backwards and the forwards again).

add in functionality from trunk, editing base shapekey now offsets other keys when exiting editmode.

Camera tracing integration
==========================

Fix for SAD tracking sliding marker.

replace BLI_strtok_r from r41337 with lighter method that doesnt alloc for template_list

Camera tracking integration
===========================

DeBalie commit (main changes only):

- Code cleanup
- Selectable tracking graph curves and curve knots
- Graph curve and curve knots can be deleted now
- Fixed wrong write when linking libraries
(error is caused by hardcoded cound of linkable ID blocks)
- Fixed for KLT tracker when using keyframe adjustment

macro -> math replacements, uncomment mirror funcs.

Merge with trunk r41342

Fix: OpenGL renders on graphics cards which do not support non-power-of-two
textures were stretched and the wrong size.