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

[Campbell Barton]

Commit: 1ee11b50854c6907fc9a60686db93ca3aa0a6342
Author: Campbell Barton
Date:   Sat Jul 29 08:43:58 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB1ee11b50854c6907fc9a60686db93ca3aa0a6342

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesdna/DNA_ID.h
index dde1daee5c9,da0f505c4f3..d457401bb33
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@@ -404,11 -387,9 +404,11 @@@ enum 
  	FILTER_ID_WO        = (1 << 26),
  	FILTER_ID_PA        = (1 << 27),
  	FILTER_ID_CF        = (1 << 28),
 +	FILTER_ID_WS        = (1 << 29),
- 	FILTER_ID_LP        = (1 << 31),
++	FILTER_ID_LP        = (1u << 31),
  };
  
 -/* IMPORTANT: this enum matches the order currently use in set_lisbasepointers,
 +/* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
   * keep them in sync! */
  enum {
  	INDEX_ID_LI = 0,