Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 22:43:58 +0000 (08:43 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 22:49:34 +0000 (08:49 +1000)
1  2 
source/blender/editors/include/ED_anim_api.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_types.h

index dde1daee5c9c6fcb55ff330786c041bc34835a18,da0f505c4f38393f49bb049a105a7d37a3c06db4..d457401bb3330eab06f6efafd63160ab2a900312
@@@ -404,11 -387,9 +404,11 @@@ enum 
        FILTER_ID_WO        = (1 << 26),
        FILTER_ID_PA        = (1 << 27),
        FILTER_ID_CF        = (1 << 28),
-       FILTER_ID_LP        = (1 << 31),
 +      FILTER_ID_WS        = (1 << 29),
++      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,
Simple merge