Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 13 Apr 2018 10:19:31 +0000 (12:19 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 13 Apr 2018 10:19:31 +0000 (12:19 +0200)
commit07fc6c922493bf0f6252da663e9854b8c9d95b8b
tree9823b72f6933d323028ba8157e90c7b6db009687
parent199715eabccce8d91cd4f9705762305e8f236b8c
parent332846b188d6c7463758fb8d8659785beccde63a
Merge branch 'master' into blender2.8
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_nla/space_nla.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/extern/include/RE_render_ext.h
source/blender/render/intern/source/zbuf.c
source/blenderplayer/bad_level_call_stubs/stubs.c