Blender Git Loki

Use utility for adding new object layer tree when adding new scene

Missed this in last commit.

Add utility for adding new object layer tree with default layer

Merge branch 'master' into soc-2016-multiview

It seems that we have some changes in multiview stablization
happened in the master branch. Solve the conflicts in versioning.

Cycles microdisplacement: Improved automatic bump mapping

Object coordinates can now be used in the displacement shader and will give
correct results, where as before bump mapping was calculated from the displace
positions and resulted in incorrect shading.

This works by evaluating the shader in two parts, first bump then surface, and
setting the shader state to match what it would be if the surface was
undisplaced for the bump shader evaluation. Currently only `P` is set as if
undisplaced, but other shader variables could be set as well, such as `I` or
`time`. Since these aren't set to anything meaningful for displacement I left
them out of this patch, we can decide what to do with them separately.

Cycles microdisplacement: Store undisplaced coordinates for meshes when requested

Cycles: don't crash if OSLRenderServices::osl_ts is unset

Cycles: remove duplicate shader storage

Storing multiple copies of a shader was needed when the displacement method was
a mesh option and could be different for each mesh. Now that its a shader option
this is unnecessary.

Merge branch 'master' into temp-cycles-microdisplacement

Cleanup: some bad sizeof() usages.

Cleanup/security fix: do not use strcpy (at least in new code).

This function is only really secure in a very limited amount of cases,
and can especially bite you later if you change some buffer sizes...
So not worth bothering with it, just always use BLI_strncpy instead.

Cleanup for previous commit (nasty IDE replacing tads with spaces, tsst)

Sorry for the noise :|

Two fixes for optional ndof & fix bplayer for that...

Seriuosly, guys... Please always check that kind of changes with and without affected option, and in full build case.

Freestyle: fix wrong arg order, and cleanup confusing loop (both reported by coverity).

Error: `origin` and `edge` args were swapped in final `FindOccludee()` call of `ViewMapBuilder::ComputeRayCastingVisibility()`

Cleanup: main for loop in `Strip::createStrip()` was really confusing (though correct),
generated a false positive in coverity scan, now should be cleaner how it loops over its vprev/v/v2
triplet of consecutive items.

Final UI messages fixes (for this session...).

Fix bplayer (c) after NDOF changes from merwin

Cleanup: ifdef function which is only used from ifdef-ed code

NDOF: compile 3D mouse code only if WITH_INPUT_NDOF

When WITH_INPUT_NDOF is disabled, 3D mouse handling code is removed
from:

- GHOST (was mostly done, finished the job)
- window manager
- various editors
- RNA
- keymaps

The input tab of user prefs does not show 3D mouse settings. Key map
editor does not show NDOF mappings.

DNA does not change.

On my Mac the compiled binary is 42KB smaller after this change. It
runs fine WITH_INPUT_NDOF on or off.

NDOF: suppress buttons debug log

Accidentally left this in the 3D mouse code. Mac only.

Fix compiler warning after fix for T48913.

Code cleanup to use array.data() rather than &array[0]

(Now without the build errors)