Commit: ab7d449299532778c706a6c1c1b8b22295a039ba Author: Antony Riakiotakis Date: Fri Sep 9 23:14:13 2016 +0200 Branches: temp_display_optimization https://developer.blender.org/rBab7d449299532778c706a6c1c1b8b22295a039ba
Merge branch 'master' into temp_display_optimization =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/editderivedmesh.c index 7dc1fc4,e51a3c3..7107927 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@@ -57,8 -56,8 +58,9 @@@ #include "MEM_guardedalloc.h" +#include "GPU_buffers.h" #include "GPU_glew.h" + #include "GPU_buffers.h" #include "GPU_shader.h" #include "GPU_basic_shader.h" _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs