2.5/Texture paint

* Made texture paint object-localized too.

Note for Brecht: gpu_draw.c had three uses of G_TEXTUREPAINT that I was not able to cleanly fix, so commented out for now. Can you take a look and see what should be done here?

1 files changed, 6 insertions, 9 deletions

diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 31490dd22cc..86082018834 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -137,9 +137,6 @@ static int retopo_mesh_paint_check() {return 0;}
 
 static void ED_toggle_paint_modes(bContext *C, int mode)
 {
-	if(mode & G_TEXTUREPAINT)
-		WM_operator_name_call(C, "PAINT_OT_texture_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL);
-
 	if(mode & G_PARTICLEEDIT)
 		WM_operator_name_call(C, "PARTICLE_OT_particle_edit_toggle", WM_OP_EXEC_REGION_WIN, NULL);
 }
@@ -151,7 +148,7 @@ int ED_view3d_exit_paint_modes(bContext *C)
 
 	ED_toggle_paint_modes(C, G.f);
 	
-	G.f &= ~(G_TEXTUREPAINT+G_PARTICLEEDIT);
+	G.f &= ~G_PARTICLEEDIT;
 
 	return restore;
 }
@@ -3377,7 +3374,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 			}
 		} 
 		else if (v3d->modeselect == V3D_TEXTUREPAINTMODE_SEL) {
-			if (!(G.f & G_TEXTUREPAINT)) {
+			if (ob && !(ob->mode & OB_MODE_TEXTURE_PAINT)) {
 				v3d->flag &= ~V3D_MODE;
 				ED_view3d_exit_paint_modes(C);
 				ED_object_toggle_modes(C, ob->mode);
@@ -3606,7 +3603,7 @@ static void view3d_header_pulldowns(const bContext *C, uiBlock *block, Object *o
 		uiDefPulldownBut(block, view3d_vpaintmenu, NULL, "Paint", xco,yco, xmax-3, 20, "");
 		xco+= xmax;
 	} 
-	else if (G.f & G_TEXTUREPAINT) {
+	else if (ob && ob->mode & OB_MODE_TEXTURE_PAINT) {
 		xmax= GetButStringLength("Paint");
 		uiDefPulldownBut(block, view3d_tpaintmenu, NULL, "Paint", xco,yco, xmax-3, 20, "");
 		xco+= xmax;
@@ -3691,7 +3688,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	else if (ob && (ob->mode & OB_MODE_SCULPT))  v3d->modeselect = V3D_SCULPTMODE_SEL;
 	else if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) v3d->modeselect = V3D_WEIGHTPAINTMODE_SEL;
 	else if (ob && (ob->mode & OB_MODE_VERTEX_PAINT)) v3d->modeselect = V3D_VERTEXPAINTMODE_SEL;
-	else if (G.f & G_TEXTUREPAINT) v3d->modeselect = V3D_TEXTUREPAINTMODE_SEL;
+	else if (ob && (ob->mode & OB_MODE_TEXTURE_PAINT)) v3d->modeselect = V3D_TEXTUREPAINTMODE_SEL;
 	/*else if(G.f & G_FACESELECT) v3d->modeselect = V3D_FACESELECTMODE_SEL;*/
 	else if(G.f & G_PARTICLEEDIT) v3d->modeselect = V3D_PARTICLEEDITMODE_SEL;
 		
@@ -3702,7 +3699,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	if(ob && (ob->flag & OB_POSEMODE)) v3d->flag |= V3D_POSEMODE;
 	if(ob && (ob->mode & OB_MODE_VERTEX_PAINT)) v3d->flag |= V3D_VERTEXPAINT;
 	if(ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) v3d->flag |= V3D_WEIGHTPAINT;
-	if (G.f & G_TEXTUREPAINT) v3d->flag |= V3D_TEXTUREPAINT;
+	if(ob && (ob->mode & OB_MODE_TEXTURE_PAINT)) v3d->flag |= V3D_TEXTUREPAINT;
 	if(paint_facesel_test(ob)) v3d->flag |= V3D_FACESELECT;
 	
 	uiDefIconTextButS(block, MENU, B_MODESELECT, (v3d->modeselect),view3d_modeselect_pup(scene) , 
@@ -3746,7 +3743,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
  			uiBlockEndAlign(block);
  		}
  	} else {
- 		if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT)) || G.f & G_TEXTUREPAINT)) {
+ 		if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) {
  			uiDefIconButBitI(block, TOG, G_FACESELECT, B_VIEW_BUTSEDIT, ICON_FACESEL_HLT,xco,yco,XIC,YIC, &G.f, 0, 0, 0, 0, "Painting Mask (FKey)");
 			header_xco_step(ar, &xco, &yco, &maxco, XIC+10);
  		} else {