svn merge -r40197:40311 ^/trunk/blender
[blender.git] / source / blender / editors / sculpt_paint / paint_image.c
index 784c35c..8992dc8 100644 (file)
@@ -5408,7 +5408,16 @@ int facemask_paint_poll(bContext *C)
 {
        return paint_facesel_test(CTX_data_active_object(C));
 }
-
+// Jason
+int vert_paint_poll(bContext *C)
+{
+       return paint_vertsel_test(CTX_data_active_object(C));
+}
+// Jason
+int mask_paint_poll(bContext *C)
+{
+       return paint_facesel_test(CTX_data_active_object(C)) || paint_vertsel_test(CTX_data_active_object(C));
+}
 /* use project paint to re-apply an image */
 static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
 {