UI cleanup work;

Proportional edit:

- Proportional mode added to header as button/menu. Including new option
  to have only connected geometry influenced.
- Added icons for proportional & proportional modes
- Make proportional edit data part of Scene, so all gets saved.
  The Global flag G_PROPORTIONAL was removed
- Made sure #defines get used properly, also tweaked order for proportional
  so it starts with regular 'smooth' by default.
- Use ALT+O in editmode to switch to new proportional 'connected' mode

Other UI stuff:

- in EditMode, the layer buttons get hidden... the amount of icons in
  3d header grows to fast. :)
- made less ugly icons for the Manipulators. Still can be better.
- Added alpha-filter for pre-processing Icon-image, giving nicer display
  of icon-antialising on dark or bright backdrops
- disabled Manipulators when in editmode, and current layers don't show
  the edited data.
- Added the value used to define Normal size (editmode draw) in Scene too,
  so it gets saved.

1 files changed, 7 insertions, 9 deletions

diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 2debd4aee67..82a65935d7f 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -1622,7 +1622,6 @@ static void draw_em_measure_stats(Object *ob, EditMesh *em)
 
 static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *baseDM, DerivedMesh *realDM, int dt)
 {
-	extern float editbutsize;	/* buttons.c */
 	Mesh *me = ob->data;
 	DerivedMesh *cageDM;
 
@@ -1701,7 +1700,7 @@ static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *baseDM, Derived
 
 		if(G.f & G_DRAWNORMALS) {
 			BIF_ThemeColor(TH_NORMAL);
-			draw_em_face_normals(em, editbutsize);
+			draw_em_face_normals(em, G.scene->editbutsize);
 		}
 
 		if(G.f & (G_DRAW_EDGELEN|G_DRAW_FACEAREA|G_DRAW_EDGEANG))
@@ -2684,7 +2683,6 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 
 static void drawnurb(Object *ob, Nurb *nurb, int dt)
 {
-	extern float editbutsize;	/* buttons.c */
 	Curve *cu;
 	Nurb *nu;
 	BevPoint *bevp;
@@ -2726,13 +2724,13 @@ static void drawnurb(Object *ob, Nurb *nurb, int dt)
 			while(nr-- > 0) {
 				
 				glBegin(GL_LINE_STRIP);
-				vec[0]= bevp->x-editbutsize*bevp->mat[0][0];
-				vec[1]= bevp->y-editbutsize*bevp->mat[0][1];
-				vec[2]= bevp->z-editbutsize*bevp->mat[0][2];
+				vec[0]= bevp->x-G.scene->editbutsize*bevp->mat[0][0];
+				vec[1]= bevp->y-G.scene->editbutsize*bevp->mat[0][1];
+				vec[2]= bevp->z-G.scene->editbutsize*bevp->mat[0][2];
 				glVertex3fv(vec);
-				vec[0]= bevp->x+editbutsize*bevp->mat[0][0];
-				vec[1]= bevp->y+editbutsize*bevp->mat[0][1];
-				vec[2]= bevp->z+editbutsize*bevp->mat[0][2];
+				vec[0]= bevp->x+G.scene->editbutsize*bevp->mat[0][0];
+				vec[1]= bevp->y+G.scene->editbutsize*bevp->mat[0][1];
+				vec[2]= bevp->z+G.scene->editbutsize*bevp->mat[0][2];
 				glVertex3fv(vec);
 
 				glEnd();