[Bf-blender-cvs] [da4a679ed51] soc-2016-pbvh-painting: Merge branch 'master' into soc-2016-pbvh-painting

[Campbell Barton]

Commit: da4a679ed5181c8d4151a3d6871ed015022db944
Author: Campbell Barton
Date:   Mon Apr 10 12:22:11 2017 +1000
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rBda4a679ed5181c8d4151a3d6871ed015022db944

Merge branch 'master' into soc-2016-pbvh-painting

===================================================================



===================================================================

diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index 334087110ef,729dd9dc57b..7a643703bf8
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -35,6 -35,8 +35,7 @@@
  #include "BLI_math.h"
  #include "BLI_array_utils.h"
  #include "BLI_bitmap.h"
 -#include "BLI_stack.h"
+ #include "BLI_string_utils.h"
  
  #include "IMB_imbuf.h"
  #include "IMB_imbuf_types.h"