Commit: 613d505eabf9c7ecfcfbb96682d71de9991a141c Author: Antony Riakiotakis Date: Sun Dec 27 20:18:15 2015 +0100 Branches: temp_display_optimization https://developer.blender.org/rB613d505eabf9c7ecfcfbb96682d71de9991a141c
Merge branch 'master' into temp_display_optimization Conflicts: source/blender/blenkernel/intern/editderivedmesh.c =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/editderivedmesh.c index 2886191,642a89d..c16f22f --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@@ -57,14 -55,10 +57,14 @@@ #include "MEM_guardedalloc.h" +#include "GPU_buffers.h" - #include "GPU_extensions.h" #include "GPU_glew.h" + #include "GPU_shader.h" + #include "GPU_basic_shader.h" +#include "WM_api.h" + - extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ + static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4]); typedef struct EditDerivedBMesh { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs