Blender Git Commits

Implementing Chaining. Have problems for half-occluded line. Still thinking for solution.

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c

Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

# Conflicts:
# source/blender/draw/engines/lanpr/lanpr_chain.c

Implementing software result chaining. Do NOT compile!

Merge branch 'blender2.8' into greasepencil-object

Fix problem with preview for not visible materials

The preview must be generated with the color enabled and not checking the current scene settings. If we don't do this, the preview is empty for these materials.

Implementing software result chaining. Do NOT compile!

Change RNA update to avoid unnecessary preview updates

Merge branch 'blender2.8' into greasepencil-object

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

# Conflicts:
# intern/opensubdiv/opensubdiv_capi.h
# intern/opensubdiv/opensubdiv_evaluator_capi.cc
# source/blender/modifiers/intern/MOD_mybmesh.c

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/draw/modes/object_mode.c

Invert thumbnail switch to make UI more consistent

Also changed icon.

Visual Studio compile fixes

Add delete button to Color Preview list

This makes the control more consistent and avoid flickering when change list mode.

File RW OK

UI: Replace color by material previews in list

To make more consistent the UI, the list of colors must shows the preview, not the old color boxes.

Besides, the new materials are more complex that a simple color box and the image was not representative.

Merge branch 'blender2.8' into greasepencil-object

Use live icons to template_ID for graese pencil materials

Add new parameter to template_ID to use live icon in button

By default, the button uses a predefined fixed icon, but in some situations it's better to show the preview (materials)