Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 25 Feb 2017 23:15:59 +0000 (00:15 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 25 Feb 2017 23:15:59 +0000 (00:15 +0100)
commit3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e
tree66ffef104bffcd2490d929c9789fc2cbc11e73ad
parentbda0456933e87c2f623a8e4f980bf7cfc6b3982a
parent5c3216e2334863137019b55a44d5b9cfea842c10
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/effect.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator_args.c