Blender Git Loki

Merge branch 'master' into asset-experiments

Some ultimate cleanups.

Merge branch 'master' into asset-experiments

Minor tweak - adapt a bit number of preview workers to number of available physical threads!

Merge branch 'master' into asset-experiments

Code Cleanup: Extract out screenspace to 3D logic for GP Sculpt

GPencil Tablet Support: Eraser now works during Continuous Drawing

When continuous drawing is enabled, the eraser-end of the pen can be used to
erase strokes (as an alternative to RMB).

The keymap system still doesn't let us add such tablet events to the keymap
as actual events though, so we cannot just have a D+Eraser = Erase keymapping.

GPencil: Don't draw onion skins during animation playback

* When playing back animations, onion skinning is temporarily disabled now
so that the poses can be seen more clearly.

- I've supposedly used the check which disables this for animation scrubbing,
(I've tried both and checked the logic for each), but they don't seem to be
working as advertised. So, for now, onionskins are still visible during scrubbing.

* Onion skinning is also disabled for rendering playblasts and for file previews/
sequencer renders.

crash fixes for greasepencil edge fracture

fix: remove doubles on internal cutter mesh created by (nearly) cyclic greasepencil strokes (so non-manifolds are avoided there)

fix: set cutter axis correctly (RNA called a different function there)

Merge branch 'master' into GPencil_Editing_Stage3

Conflicts:
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
source/blender/blenloader/intern/versioning_270.c

mark "Dynamic Fracture" as WIP

compile fixes due to merge

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
CMakeLists.txt
build_files/cmake/macros.cmake
intern/cycles/kernel/geom/geom_triangle_intersect.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/svm/svm_closure.h
release/scripts/modules/bpy_extras/io_utils.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_deform.h
source/blender/blenkernel/BKE_mesh_mapping.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_rigidbody.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/keyframes_general.c
source/blender/editors/armature/armature_edit.c
source/blender/editors/gpencil/gpencil_ops.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_shapekey.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/modifiers/intern/MOD_util.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Merge branch 'master' into openvdb

Cleanups: unnecessary includes, small de-duplication, accidental/
unwanted changes, ...

Merge branch 'master' into temp-ui-widget-refactor

Merge branch 'master' into openvdb

Use openvdb::Name for passing strings around.

Although openvdb::Name is just a typedef for std::string, this change is
for two reasons:
- it makes it a bit more consistent API wise
- it sort of documents we are passing a name and not just a string
(which could be anything: a password, a brand, a poem...)