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

[Brecht Van Lommel]

Revision: 12780
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12780
Author:   blendix
Date:     2007-12-04 15:21:58 +0100 (Tue, 04 Dec 2007)

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

Particles
=========

- Like sculptmode, a brush can now be selected from a menu with
  Ctrl+Tab in particle mode.

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_editparticle.h
    trunk/blender/source/blender/src/editparticle.c
    trunk/blender/source/blender/src/toets.c

Modified: trunk/blender/source/blender/include/BIF_editparticle.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editparticle.h	2007-12-04 13:57:28 UTC (rev 12779)
+++ trunk/blender/source/blender/include/BIF_editparticle.h	2007-12-04 14:21:58 UTC (rev 12780)
@@ -81,6 +81,7 @@
 void PE_delete_particle(void);
 void PE_remove_doubles(void);
 void PE_mirror_x(int tagged);
+void PE_selectbrush_menu(void);
 
 /* undo */
 void PE_undo_push(char *str);

Modified: trunk/blender/source/blender/src/editparticle.c
===================================================================
--- trunk/blender/source/blender/src/editparticle.c	2007-12-04 13:57:28 UTC (rev 12779)
+++ trunk/blender/source/blender/src/editparticle.c	2007-12-04 14:21:58 UTC (rev 12780)
@@ -2768,6 +2768,21 @@
 	}
 }
 
+void PE_selectbrush_menu(void)
+{
+	ParticleEditSettings *pset= PE_settings();
+	int val;
+	
+	pupmenu_set_active(pset->brushtype);
+	
+	val= pupmenu("Select Brush%t|None %x0|Comb %x1|Smooth %x7|Weight %x6|Add %x5|Length %x3|Puff %x4|Cut %x2");
+
+	if(val>=0) {
+		pset->brushtype= val-1;
+		allqueue(REDRAWVIEW3D, 1);
+	}
+}
+
 /************************************************/
 /*			Particle Edit Undo					*/
 /************************************************/

Modified: trunk/blender/source/blender/src/toets.c
===================================================================
--- trunk/blender/source/blender/src/toets.c	2007-12-04 13:57:28 UTC (rev 12779)
+++ trunk/blender/source/blender/src/toets.c	2007-12-04 14:21:58 UTC (rev 12780)
@@ -735,6 +735,8 @@
 				}
 				else if(ob->type==OB_MESH) {
 					if(ob==G.obedit) EM_selectmode_menu();
+					else if(G.f & G_PARTICLEEDIT)
+						PE_selectbrush_menu();
 					else if(G.f & G_SCULPTMODE)
 						sculptmode_selectbrush_menu();
 					else set_wpaint();