svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / blenkernel / intern / DerivedMesh.c
index bf77f8bc9c0f601a457225be8d99d498efacd6cf..63ce62503ad12b0652f1531010facad3518002d2 100644 (file)
 #include "BKE_texture.h"
 #include "BKE_multires.h"
 
-
 #include "BLO_sys_types.h" // for intptr_t support
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GL/glew.h"
 
 #include "GPU_buffers.h"
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_material.h"
 
-#include "ED_sculpt.h" /* for ED_sculpt_modifiers_changed */
+extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
 // Jason was here, this is for multi-paint
 #include "ED_armature.h"
 
@@ -2401,7 +2399,7 @@ static void clear_mesh_caches(Object *ob)
        }
 
        if(ob->sculpt) {
-               ED_sculpt_modifiers_changed(ob);
+               object_sculpt_modifiers_changed(ob);
        }
 }