Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 23 Dec 2016 14:36:16 +0000 (15:36 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 23 Dec 2016 14:36:16 +0000 (15:36 +0100)
commit605263177b8eea24c1449e4dbf0138175ec3dddf
treeea297c777bcfae7c647ca88c48b8df3f8f3bd843
parent76c4f0ec6c61bdc33ae908849f632771a1f997c0
parentb47c912f4be877bf5511117864dfc2a5b30c0dca
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/intern/effect.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawsimdebug.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/makesrna.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator_args.c