Blender Git Loki

Code Cleanup: de-duplicate nested node tree checking

Fix clip editor interface being broken by a71f072

Please do test commits before committing them.
This is second working day in a row which was started with
solving issues caused by untested patches.

patch by Mihai Melinescu: boost hardcoded MSVC12

Updated CMakeLists.txt to account for boost hardcoded locations for VS 2013.

Reviewers: juicyfruit

Differential Revision: https://developer.blender.org/D261

UI: Fix for icon-only menus too small click-able area

UI: Replace +/- menus with collapsible ones

Patch D160, by Scott Petrovic with own modifications.

Build System: icon files now depend on UI_icons.h for CMake

Now changing UI_icons.h causes icons to be re-generated, without this
adding a new icon wouldn't automatically get into the generated PNG.

Curves: save active point to file

Changed curve active point from pointer to index. Allows curve active point to be saved to file and retained between modes for free. Also some small optimisations by removing pointer look up code.

- Made active point access functions into BKE API calls.
- Fixes operators where curve de-selection resulted in unsel-active point.
- Split curve delete into 2 functions

.gitignore: Adding CMakeLists.txt.user for QtCreator users.

Fix typo in nla blend modes.

Fix T38354: Excess memory allocation when projecting onto object with multires

Found three cases where created bvhtree was not freed...

Cycles Standalone: Basic support for external OSL shaders.

* Very simple implementation, only allows for 1 output socket. As we haven't decided yet whether we keep the XML API, rather not spend more time on this now.

* To use an external osl shader, put the .osl file next to the xml file.
* Parameters: "output" is the output socket name, "output_type" the variable type (float, color and closure color are supported).
Example:
<osl_shader name="tex" src="ramp_closure.osl" output="Phong" output_type="closure color" />
<connect from="tex Phong" to="output surface" />

Fix T38366: export collada crash - if you set a keyframe

Don't assume all objects have a valid animdata...

Cleanup of BLI_smallhash

Factorized a bit the code here, think it's more readable now... No performance enhancement though.

Reviewed by: campbellbarton

Differential Revision: https://developer.blender.org/D259

Code Cleanup: style and correct API class ref

Cycles: Set samples to USHRT_MAX per default in the constructor, this is already used elsewhere.

Cycles Standalone: Various changes

* Change Info in header, put more important info to the left
* API: Move Camera width/height to camera, add some film properties
* Add ESC key to help menu

Fix T38353: some EXR files from other applications not loading correctly.

* EXR layers with names like 'Z' without any pass name were not loaded at all
and would break the Combined pass as well.
* EXR pass names longer than 16 characters where writing past the end of the
array and getting invalid names.

fix building cycles standalone on windows / cmake

Cleanup: Simplify Cycles standalone OSL detection code.

Blender docs: Correct upper limit, shown for missing -t option value.

Differential Revision: https://developer.blender.org/D248