[Bf-blender-cvs] [70f8eaf1b76] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 70f8eaf1b769c402ec61d86f25237d6b64186861
Author: Bastien Montagne
Date:   Sat Jun 9 15:18:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB70f8eaf1b769c402ec61d86f25237d6b64186861

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

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



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

diff --cc source/blender/blenkernel/BKE_modifier.h
index b5d3e67b970,e9ce91996e0..b40d32203f6
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -468,25 -431,29 +468,25 @@@ void modifier_mdef_compact_influences(s
  
  void        modifier_path_init(char *path, int path_maxlen, const char *name);
  const char *modifier_path_relbase(struct Main *bmain, struct Object *ob);
- 
+ const char *modifier_path_relbase_from_global(struct Object *ob);
  
 -/* wrappers for modifier callbacks */
 +/* wrappers for modifier callbacks that ensure valid normals */
  
  struct DerivedMesh *modwrap_applyModifier(
 -        ModifierData *md, struct Object *ob,
 -        struct DerivedMesh *dm,
 -        ModifierApplyFlag flag);
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
 +        struct DerivedMesh *dm);
  
  struct DerivedMesh *modwrap_applyModifierEM(
 -        ModifierData *md, struct Object *ob,
 -        struct BMEditMesh *em,
 -        struct DerivedMesh *dm,
 -        ModifierApplyFlag flag);
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
 +        struct BMEditMesh *em, struct DerivedMesh *dm);
  
  void modwrap_deformVerts(
 -        ModifierData *md, struct Object *ob,
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
          struct DerivedMesh *dm,
 -        float (*vertexCos)[3], int numVerts,
 -        ModifierApplyFlag flag);
 +        float (*vertexCos)[3], int numVerts);
  
  void modwrap_deformVertsEM(
 -        ModifierData *md, struct Object *ob,
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
          struct BMEditMesh *em, struct DerivedMesh *dm,
          float (*vertexCos)[3], int numVerts);
  
diff --cc source/blender/makesdna/DNA_ID.h
index f79d3259244,c632b87752b..8043e01a147
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -379,9 -280,10 +379,10 @@@ typedef enum ID_Type 
  #define ID_REAL_USERS(id) (((ID *)id)->us - ID_FAKE_USERS(id))
  #define ID_EXTRA_USERS(id) (((ID *)id)->tag & LIB_TAG_EXTRAUSER ? 1 : 0)
  
 -#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM))
 +#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM) && (GS((id)->name) != ID_WS))
  
  #define ID_BLEND_PATH(_bmain, _id) ((_id)->lib ? (_id)->lib->filepath : BKE_main_blendfile_path((_bmain)))
+ #define ID_BLEND_PATH_FROM_GLOBAL(_id) ((_id)->lib ? (_id)->lib->filepath : BKE_main_blendfile_path_from_global())
  
  #define ID_MISSING(_id) (((_id)->tag & LIB_TAG_MISSING) != 0)