Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/object.c

Fix missed materials after append GP object

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

Conflicts:
source/blender/draw/engines/lanpr/lanpr_engine.c

debugging f12 weird behavior

debugging f12

Merge branch 'blender2.8' into greasepencil-object

Fixed multithread RenderTriangle size error

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py

Fix typo

Fix: Crash when erasing annotation strokes

The code was assuming that dvert data always exists on strokes
(it shouldn't, if we're doing everything correctly!), which
caused crashes when erasing annotation strokes (which definitely
don't have this data).

TODO:
Check that the rest of the code doesn't make similar assumptions!

Cleanup: Remove 2D Editor support from gpencil_paint.c

The "GPENCIL_OT_draw" operator pretty much didn't support non-3D
views already (at least not without crashing). Now that we've got
a separate/dedicated operator for Annotation support (GPENCIL_OT_annotate),
we can remove the old 2D Editor support here.

Cleanup: Remove "Scene->gp_object"

This was from an earlier design for supporting Annotations,
where in the 3D view, we would have only had GP Objects.
Now that we've moved away from that idea, and are back to
having a separate "Annotations" system, this concept can
be removed from the code again.

Annotations: WIP first steps towards toolbar support

This adds a toolbar entry for activating the annotations tools
as active tools. Many things are WIP still (e.g. tool settings
are yet to come, as the necessary props aren't defined in DNA/RNA yet).

Todo's:
* Icons are missing. The necessary icons *do* exist right now
in the icon_geom.blend file, but I can't get them to export/generate
.dat files that we can use in the UI here. That said, the placeholder
names (from that file) are now used.

* Key mappings need work/testing. They seem to work well enough as-is
already though

* Tool settings (in topbar) are not implemented yet. Coming soon
(aka tomorrow, after I get some sleep)

* Non-3D view toolbar support

Cleanup: Remove deprecated toolsettings->gpencil_src field

This was used to determine whether Grease Pencil data was stored
on the Scene level or per Object. It isn't actually used anywhere
in 2.8 now, with the GP Objects / Annotations. Removing now
to make space for storing the toolsettings for the annotation tools.

Multithread OK.

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

move line layer and delete line layer component ok.

Line selection from object and collection is ok, material pending.

Merge branch 'blender2.8' into greasepencil-object

GP UI: Make the "Grease Pencil Paper" panel/options part of the Overlays popover

This is a special feature only used during Draw Mode, and functionally
acts like an overlay. Some cleanups/tweaks to this are needed still,
but it's good to get it out of the way.