GSOC 2013 paint

Yep, at last it's here!

There are a few minor issues remaining but development can go on in
master after discussion at blender institute.

For full list of features see:

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting

Thanks to Sergey and Campbell for the extensive review and to the
countless artists that have given their input and reported issues during
development.

2 files changed, 33 insertions, 3 deletions

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 386c9bbcb84..6eb8e525c96 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
@@ -48,6 +49,8 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_editmesh.h"
+#include "BKE_material.h"
+
 #include "BKE_scene.h"
 
 #include "BIF_gl.h"
@@ -479,13 +482,39 @@ static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
 {
 	const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
 	Image *curimage = ED_space_image(sima);
+	Mesh *me = ob->data;
+	Material *ma;
 
 	if (sima->flag & SI_DRAW_OTHER) {
 		draw_uvs_other(scene, ob, curimage, new_shading_nodes);
 	}
 
 	UI_ThemeColor(TH_UV_SHADOW);
-	draw_uvs_other_mesh(ob, curimage, new_shading_nodes);
+
+	ma = give_current_material(ob, ob->actcol);
+
+	if (me->mtpoly) {
+		MPoly *mpoly = me->mpoly;
+		MLoopUV *mloopuv, *mloopuv_base;
+		int a, b;
+		if (!(ma && ma->texpaintslot && ma->texpaintslot[ma->paint_active_slot].uvname[0] &&
+		      (mloopuv = CustomData_get_layer_named(&me->ldata, CD_MLOOPUV, ma->texpaintslot[ma->paint_active_slot].uvname))))
+		{
+			mloopuv = me->mloopuv;
+		}
+
+		mloopuv_base = mloopuv;
+
+		for (a = me->totpoly; a > 0; a--, mpoly++) {
+			glBegin(GL_LINE_LOOP);
+
+			mloopuv = mloopuv_base + mpoly->loopstart;
+			for (b = 0; b < mpoly->totloop; b++, mloopuv++) {
+				glVertex2fv(mloopuv->uv);
+			}
+			glEnd();
+		}
+	}
 }
 
 #ifdef USE_EDBM_LOOPTRIS
@@ -922,7 +951,7 @@ void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedi
 	ToolSettings *toolsettings = scene->toolsettings;
 	int show_uvedit, show_uvshadow, show_texpaint_uvshadow;
 
-	show_texpaint_uvshadow = (obact && obact->type == OB_MESH && obact->mode == OB_MODE_TEXTURE_PAINT);
+	show_texpaint_uvshadow = ED_space_image_show_texpaint(sima, obact);
 	show_uvedit = ED_space_image_show_uvedit(sima, obedit);
 	show_uvshadow = ED_space_image_show_uvshadow(sima, obedit);
 
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 6cf34d9f93f..ed88c72edc4 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -3827,7 +3827,8 @@ static void UV_OT_reveal(wmOperatorType *ot)
 static int uv_set_2d_cursor_poll(bContext *C)
 {
 	return ED_operator_uvedit_space_image(C) ||
-	       ED_space_image_maskedit_poll(C);
+	       ED_space_image_maskedit_poll(C) ||
+	       ED_space_image_paint_curve(C);
 }
 
 static int uv_set_2d_cursor_exec(bContext *C, wmOperator *op)