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

[Bastien Montagne]

Commit: cf8add42b807449e6f96f8ecab637d52e166052f
Author: Bastien Montagne
Date:   Mon Aug 7 21:09:10 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBcf8add42b807449e6f96f8ecab637d52e166052f

Merge branch 'master' into blender2.8

Stupid git handles merges terribly when there are conflicts and branch
is modified buring merge process... :((((

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



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

diff --cc source/blender/makesdna/DNA_ID.h
index 63752142b84,a940e4bf65d..4b628c4bc70
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -364,9 -350,6 +364,9 @@@ enum 
  	LIB_TAG_ANIM_NO_RECALC  = 1 << 14,
  	LIB_TAG_ID_RECALC_ALL   = (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA),
  
 +	/* The datablock is a copy-on-write version. */
- 	LIB_TAG_COPY_ON_WRITE  = (1 << 15),
++	LIB_TAG_COPY_ON_WRITE   = 1 << 15,
 +
  	/* RESET_NEVER tag datablock for freeing etc. behavior (usually set when copying real one into temp/runtime one). */
  	LIB_TAG_NO_MAIN          = 1 << 16,  /* Datablock is not listed in Main database. */
  	LIB_TAG_NO_USER_REFCOUNT = 1 << 17,  /* Datablock does not refcount usages of other IDs. */