[Bf-blender-cvs] [77d43236c35] temp-fracture-modifier-2.8: Merge remote-tracking branch 'origin/blender2.8' into fracture_modifier-2.8

[Martin Felke]

Commit: 77d43236c350418bade406d73812643067a72a62
Author: Martin Felke
Date:   Sun Nov 25 12:36:44 2018 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB77d43236c350418bade406d73812643067a72a62

Merge remote-tracking branch 'origin/blender2.8' into fracture_modifier-2.8

# Conflicts:
#	release/scripts/addons
#	source/blender/blenkernel/intern/armature_update.c
#	source/blender/editors/interface/interface_templates.c
#	source/blender/python/intern/bpy_app_handlers.c

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_operators/presets.py
index f662d63b2d2,770133e2514..530cc5d0c4d
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@@ -842,9 -721,7 +814,8 @@@ classes = 
      AddPresetCamera,
      AddPresetCloth,
      AddPresetFluid,
 +    AddPresetFracture,
      AddPresetHairDynamics,
-     AddPresetInteraction,
      AddPresetInterfaceTheme,
      AddPresetKeyconfig,
      AddPresetNodeColor,