patch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing.
from Troy Sobotka (sobotka)

This gives nicer blending then 'ADD', setting as default for new masks.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49328 954f8c5b-7b00-dc11-b283-0030488c597c
Blender now compiles with recent clang

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49332 954f8c5b-7b00-dc11-b283-0030488c597c
Fix regression in clip reloading -- after recent change movie used
to be reset to default image size instead of it's actual size.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49333 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49341 954f8c5b-7b00-dc11-b283-0030488c597c
BGE: Fixing a memory leaked caused by the character controller (CcdPhysicsController::m_characterController was not getting freed).

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49342 954f8c5b-7b00-dc11-b283-0030488c597c
fix for own regression with handling of script paths, however this didnt work quite right before either.

Handle these 2 kinds of script paths
* user script path: ~/.blender/scripts OR $BLENDER_USER_SCRIPTS
* pref script path: always bpy.context.user_preferences.filepaths.script_directory

now both are returned by bpy.utils.script_paths()


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49343 954f8c5b-7b00-dc11-b283-0030488c597c
Documentation:
* Some UI docs for the Best Practise guide. Still WIP. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49345 954f8c5b-7b00-dc11-b283-0030488c597c
scale down histogram button movement by 10, was very sensitive


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49346 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for [#27484] "Run-time command line options don't work in Multi-texture mode." reported by Josiah Lane (solarlune). The -g nomipmap = 1 option only changed the mipmapping option for bf_gpu, which BL_Texture wasn't checking. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49348 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for [#32213] "Action actuator doesn't finish playing if frame rate drops" reported by Alex Fraser (z0r). The action actuator was calling StopAction when it's time ran out. Now I'm just letting BL_Action handle stopping. Hopefully this doesn't break something else now....

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49349 954f8c5b-7b00-dc11-b283-0030488c597c
Sequel of r49112 (raising average bitrate without min/max ones is a bit useless with vbr codecs ;) ). Used +/- 50% of max average br respectively for max/min br...

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49352 954f8c5b-7b00-dc11-b283-0030488c597c
User Interface Scripts:
* Code cleanup, removed unneeded code.
* Style cleanup, don't break lines to early 
(unless marked as pep8-80 or pep8-120 compliant) 
* Keep 1 line after layout declaration empty. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49353 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49354 954f8c5b-7b00-dc11-b283-0030488c597c
Additional fix #32074, by Sven-Hendrik Haase (svenstaro). Boost version header must be included in cycles in order to expand the version check macro.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49355 954f8c5b-7b00-dc11-b283-0030488c597c
code cleanup: assign mode to a variable in the 3d view header and remove some unused imports


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49356 954f8c5b-7b00-dc11-b283-0030488c597c
Support for depth buffers in compositor and viewer node
Support for only alpha images in compositor and viewer node


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49357 954f8c5b-7b00-dc11-b283-0030488c597c
code cleanup: replace MIN2/MAX2 with minf/maxf


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49359 954f8c5b-7b00-dc11-b283-0030488c597c
code cleanup:
- building without python works again
- rename maxi/mini to i_max/i_min (so thay are available for function names)
- some minor edits to IK stretch setting (no functional changes).


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49360 954f8c5b-7b00-dc11-b283-0030488c597c
add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49361 954f8c5b-7b00-dc11-b283-0030488c597c
Fix compile error, IK_STRETCH_STIFF_EPS was undefined. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49368 954f8c5b-7b00-dc11-b283-0030488c597c