[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13685] trunk/blender/source/blender/src: Object drawing was setting switching glDepthMask(GL_FALSE); even when no particles were drawn.

[Campbell Barton]

Revision: 13685
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13685
Author:   campbellbarton
Date:     2008-02-14 13:34:54 +0100 (Thu, 14 Feb 2008)

Log Message:
-----------
Object drawing was setting switching glDepthMask(GL_FALSE); even when no particles were drawn.
Added an annoying message when people press the F key to say FaceSel mode was removed.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawobject.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2008-02-14 12:19:37 UTC (rev 13684)
+++ trunk/blender/source/blender/src/drawobject.c	2008-02-14 12:34:54 UTC (rev 13685)
@@ -5103,23 +5103,25 @@
 	if(ob->pd && ob->pd->forcefield) draw_forcefield(ob);
 
 	/* code for new particle system */
-	if(warning_recursive==0 && (flag & DRAW_PICKING)==0 && ob!=G.obedit){
+	if(		(warning_recursive==0) &&
+			(ob->particlesystem.first) &&
+			(flag & DRAW_PICKING)==0 &&
+			(ob!=G.obedit)	
+	  ) {
+		ParticleSystem *psys;
+		if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	/* for visibility, also while wpaint */
 		glDepthMask(GL_FALSE);
-		if(col || (ob->flag & SELECT)) cpack(0xFFFFFF);	/* for visibility, also while wpaint */
-		if(ob->particlesystem.first) {
-			ParticleSystem *psys;
-
-			for(psys=ob->particlesystem.first; psys; psys=psys->next)
-				draw_new_particle_system(base, psys);
-			
-			if(G.f & G_PARTICLEEDIT && ob==OBACT) {
-				psys= PE_get_current(ob);
-				if(psys && !G.obedit && psys_in_edit_mode(psys))
-					draw_particle_edit(ob, psys);
-			}
+		
+		for(psys=ob->particlesystem.first; psys; psys=psys->next)
+			draw_new_particle_system(base, psys);
+		
+		if(G.f & G_PARTICLEEDIT && ob==OBACT) {
+			psys= PE_get_current(ob);
+			if(psys && !G.obedit && psys_in_edit_mode(psys))
+				draw_particle_edit(ob, psys);
 		}
+		glDepthMask(GL_TRUE); 
 		if(col) cpack(col);
-		glDepthMask(GL_TRUE); 
 	}
 
 	{

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-02-14 12:19:37 UTC (rev 13684)
+++ trunk/blender/source/blender/src/space.c	2008-02-14 12:34:54 UTC (rev 13685)
@@ -1934,8 +1934,11 @@
 						G.f ^= G_FACESELECT;
 						allqueue(REDRAWVIEW3D, 1);
 					}
-					else if(G.f & G_PARTICLEEDIT)
+					else if(G.f & G_PARTICLEEDIT) {
 						PE_radialcontrol_start(RADIALCONTROL_SIZE);
+					} else {
+						pupmenu("Note%t|UV/Face Select was removed. Editmode now allows UV editing, Add a UV layer or Unwrap (UKey)");
+					}
 				}
 				
 				break;