Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 9 Apr 2017 06:09:12 +0000 (16:09 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 9 Apr 2017 06:09:12 +0000 (16:09 +1000)
1  2 
source/blender/blenkernel/intern/idprop.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/listbase.c

Simple merge