Blender Git Commits

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/object/object_modifier.c

WIP: Define a new preview blend file for grease pencil

The blend file is only a copy of old file. Put only as placeholder.

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

Modify code to standard api and style

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Move depsgraph tag after brush creation

If the brush was created, the tag was not working because it was done before the brush was available.

Move Overlay options to View3DOverlay

It's better to keep all overlays in the same RNA.

Replace "Notes" by "Annotations" to keep UI consistency

We can not use the word "Notes" in the UI for annotations because it creates confusion for the user.

Change some old grease pencil code to annotation

Fixed the error in annotation panel for other editors.

The main Notes switch for 3D View has been removed of the Notes panel because must be in the overlays.

Move annotations switch to Overlay struct

UI: Add again show annotation overlay switch

This was removed by error in a previous merge.

Update to new OSD blender API

Update depsgraph to active brush from toolbar

There is a problem with the synchronization of the brush if it's selected from toolbar.

This change maybe can be removed when new toolbar system will be ready, but we need it now to keep drawing brushes working.

Revert "Revert "OpenSubdiv: Make more flexible C-API to specify FVar interpolation""

This reverts commit 14c72f943aacc2036a646ab625b274bc7e9b283b.

Revert "Revert "OpenSubdiv: Fix wrong topology refiner cast""

This reverts commit 551f181742cfcbf4528369619dcfdb3a0a9d5f46.

Revert "DO NOT MERGE - revert opensubdiv commit 9a0634a253421c02dbb6d2864db49e4d382ea2a3"

This reverts commit 87ed11f0a71801f45a0579371057e149c2f7bfb6.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object