draw the right pannel when weughtpaint+vcol modes are on at the same time.

(was drawing the vcol panel in wp mode)
it may be good to not allow both modes at once.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index c2235c93da8..9f7e3d55a5a 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -2147,6 +2147,10 @@ static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 	else if(ob->flag & OB_POSEMODE) {
 		v3d_posearmature_buts(block, ob, lim);
 	}
+	else if(G.f & G_WEIGHTPAINT) {
+		uiNewPanelTitle(block, "Weight Paint Properties");
+		weight_paint_buttons(block);
+	}
 	else if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT)) {
 		extern VPaint Gvp;         /* from vpaint */
 		static float hsv[3], old[3];	// used as temp mem for picker
@@ -2161,10 +2165,6 @@ static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 			/* 'f' is for floating panel */
 			uiBlockPickerButtons(block, rgb, hsv, old, hexcol, 'f', REDRAWBUTSEDIT);
 	}
-	else if(G.f & G_WEIGHTPAINT) {
-		uiNewPanelTitle(block, "Weight Paint Properties");
-		weight_paint_buttons(block);
-	}
 	else if(G.f & G_SCULPTMODE) {
 		uiNewPanelTitle(block, "Sculpt Properties");
 		sculptmode_draw_interface_tools(block,10,150);