Commit: 9d3dc3d57b0579f90c19f51ba1f63b59d3444ba6 Author: Lukas Tönne Date: Thu Dec 10 15:21:58 2015 +0100 Branches: object_nodes https://developer.blender.org/rB9d3dc3d57b0579f90c19f51ba1f63b59d3444ba6
Merge branch 'master' into object_nodes =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/DerivedMesh.c index 4b09247,e26e514..5620d3e --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@@ -74,11 -73,9 +74,11 @@@ static DerivedMesh *navmesh_dm_createNa #include "BLI_sys_types.h" /* for intptr_t support */ +#include "BVM_api.h" + #include "GPU_buffers.h" - #include "GPU_extensions.h" #include "GPU_glew.h" + #include "GPU_shader.h" #ifdef WITH_OPENSUBDIV # include "DNA_userdef_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
