svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:32:59 +0000 (01:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 14 Sep 2011 01:32:59 +0000 (01:32 +0000)
1  2 
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_view3d/drawobject.c

Simple merge
index bf77f8bc9c0f601a457225be8d99d498efacd6cf,7a02da57350b51f234feb952cd48b325ee997e35..63ce62503ad12b0652f1531010facad3518002d2
@@@ -74,9 -69,7 +72,9 @@@
  #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"
  
  ///////////////////////////////////
  ///////////////////////////////////