Blender Git Commits

Cycles: Fix a rare divide-by-zero in a fallback sampling code

The issue only appeared when the random number happens to be exactly one
while a fallback sampling code for shallow paths was being executed.

Add/use utility macro for removing object from local view

And correct existing macro.

Make move to layer OP work with new local view data

And fix crash on redo.

Current behavior is the same as in master, which could be improved. If in local view, the move to layer OP just opens a confirmation popup saying "Move out of Local View". Confirming only moves the object out of local view, you have to use the redo panel to move it to a different layer.

Start using separate bitfield for local view visibility

Uses BKE macros to centralize things a bit.

Use a "pass" concept for strand shader organization, like the GPUMaterial system.

This will allow easier addition of other shader features later on. The system
should be merged with the GPUMaterial code, but currently the material system
is too unwieldy to integrate the strand displacement code easily. With the 2.8
viewport rewrite all of this will have to be rewritten as well anyway.

Removed deprecated modifier settings for static hair effects.

Removed leftover enum from static effects definition.

Merge branch 'strand_editmode' into strand_nodes

Added "show_brush" option for hair edit settings, expected by common paint UI.

This setting has no effect yet for hair editing, but the UI script expects it.

Merge branch 'master' into temp_localview_split

removed outflow flow type

Compatibility with old local view storage

Reading old .blends works just fine now.

Curves: Offset operator

The operator works if there are no inflection points. Function "reverse_offset" will fix that once complete.

Mark RegionView3D.localvd as deprecated

Initial commit for splitting off local-view data from layer visibility

Mostly replacing ugly nested View3D and RegionView3D pointers for now. Actual bitfield splitting comes next.

Merge branch 'master' into alembic_basic_io

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/editors/space_outliner/outliner_tools.c

Base color now applied again to the refraction of transparent Disney
materials

Added subsurface color parameter to the Disney shader

Merge branch 'master' into asset-engine