[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13879] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13879
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13879
Author:   blendix
Date:     2008-02-26 19:30:41 +0100 (Tue, 26 Feb 2008)

Log Message:
-----------

Going into vertex paint mode without vertex colors, now it doesn't
create vertex colors from shaded mode anymore. Instead there is
function in vertex paint mode to create them.

Also some fixes for previous commits.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mball.c
    trunk/blender/source/blender/src/drawobject.c
    trunk/blender/source/blender/src/drawview.c
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/vpaint.c

Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c	2008-02-26 17:46:22 UTC (rev 13878)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c	2008-02-26 18:30:41 UTC (rev 13879)
@@ -241,8 +241,6 @@
 	float loc[3], size[3];
 	int a;
 
-	orcodata= MEM_mallocN(sizeof(float)*3*dl->nr, "MballOrco");
-	
 	/* restore size and loc */
 	bb= ob->bb;
 	loc[0]= (bb->vec[0][0]+bb->vec[4][0])/2.0f;
@@ -253,6 +251,8 @@
 	size[2]= bb->vec[1][2]-loc[2];
 
 	dl= ob->disp.first;
+	orcodata= MEM_mallocN(sizeof(float)*3*dl->nr, "MballOrco");
+
 	data= dl->verts;
 	orco= orcodata;
 	a= dl->nr;

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2008-02-26 17:46:22 UTC (rev 13878)
+++ trunk/blender/source/blender/src/drawobject.c	2008-02-26 18:30:41 UTC (rev 13879)
@@ -4941,10 +4941,11 @@
 
 			if(ob==G.obedit);
 			else {
+				if(dt<OB_SOLID)
+					zbufoff= 1;
+
 				dt= OB_SHADED;
-
 				glEnable(GL_DEPTH_TEST);
-				if(dt<OB_SOLID) zbufoff= 1;
 			}
 		}
 		else {

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2008-02-26 17:46:22 UTC (rev 13878)
+++ trunk/blender/source/blender/src/drawview.c	2008-02-26 18:30:41 UTC (rev 13879)
@@ -2942,7 +2942,7 @@
 			BIF_GetThemeColor3fv(TH_BACK, col);
 			glClearColor(col[0], col[1], col[2], 0.0); 
 		}
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 		
 		glLoadIdentity();
 	}
@@ -2950,7 +2950,7 @@
 		float col[3];
 		BIF_GetThemeColor3fv(TH_BACK, col);
 		glClearColor(col[0], col[1], col[2], 0.0);
-		glClear(GL_COLOR_BUFFER_BIT);
+		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 	}
 	
 	myloadmatrix(v3d->viewmat);

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2008-02-26 17:46:22 UTC (rev 13878)
+++ trunk/blender/source/blender/src/header_view3d.c	2008-02-26 18:30:41 UTC (rev 13879)
@@ -4370,8 +4370,8 @@
 /* vertex paint menu */
 static void do_view3d_vpaintmenu(void *arg, int event)
 {
-	/* events >= 2 are registered bpython scripts */
-	if (event >= 2) BPY_menu_do_python(PYMENU_VERTEXPAINT, event - 2);
+	/* events >= 3 are registered bpython scripts */
+	if (event >= 3) BPY_menu_do_python(PYMENU_VERTEXPAINT, event - 3);
 	
 	switch(event) {
 	case 0: /* undo vertex painting */
@@ -4383,6 +4383,9 @@
 		else /* we know were in vertex paint mode */
 			clear_vpaint();
 		break;
+	case 2:
+		make_vertexcol(1);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -4399,12 +4402,13 @@
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Vertex Painting|U",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Vertex Colors|Shift K",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Shaded Vertex Colors",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
 	
-	/* note that we account for the 2 previous entries with i+2:
+	/* note that we account for the 3 previous entries with i+3:
 	even if the last item isnt displayed, it dosent matter */
 	for (pym = BPyMenuTable[PYMENU_VERTEXPAINT]; pym; pym = pym->next, i++) {
 		uiDefIconTextBut(block, BUTM, 1, ICON_PYTHON, pym->name, 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 1, i+2,
+			menuwidth, 19, NULL, 0.0, 0.0, 1, i+3,
 			pym->tooltip?pym->tooltip:pym->filename);
 	}
 	

Modified: trunk/blender/source/blender/src/vpaint.c
===================================================================
--- trunk/blender/source/blender/src/vpaint.c	2008-02-26 17:46:22 UTC (rev 13878)
+++ trunk/blender/source/blender/src/vpaint.c	2008-02-26 18:30:41 UTC (rev 13879)
@@ -1408,7 +1408,7 @@
 	if(me==NULL || me->totface==0) return;
 	if(ob->lay & G.vd->lay); else error("Active object is not in this layer");
 	
-	if(me->mcol==NULL) make_vertexcol(1);
+	if(me->mcol==NULL) make_vertexcol(0);
 
 	if(me->mcol==NULL) return;
 	
@@ -1629,7 +1629,7 @@
 		return;
 	}
 	
-	if(me && me->mcol==NULL) make_vertexcol(1);
+	if(me && me->mcol==NULL) make_vertexcol(0);
 	
 	if(G.f & G_VERTEXPAINT){
 		G.f &= ~G_VERTEXPAINT;