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.
This commit is contained in:
2005-05-03 10:54:42 +00:00
parent cdca939c2c
commit 422b69fe1e
21 changed files with 1471 additions and 1399 deletions

View File

@@ -387,8 +387,9 @@ void initTrans (TransInfo *t)
t->flag = 0;
/* setting PET flag */
if ((t->context & CTX_NO_PET) == 0 && (G.f & G_PROPORTIONAL)) {
if ((t->context & CTX_NO_PET) == 0 && (G.scene->proportional)) {
t->flag |= T_PROP_EDIT;
if(G.scene->proportional==2) t->flag |= T_PROP_CONNECTED; // yes i know, has to become define
}
getmouseco_areawin(t->imval);
@@ -719,7 +720,6 @@ void calculatePropRatio(TransInfo *t)
int i;
float dist;
short connected = t->flag & T_PROP_CONNECTED;
extern int prop_mode;
if (t->flag & T_PROP_EDIT) {
for(i = 0 ; i < t->total; i++, td++) {
@@ -743,7 +743,7 @@ void calculatePropRatio(TransInfo *t)
/* Use rdist for falloff calculations, it is the real distance */
td->flag &= ~TD_NOACTION;
dist= (t->propsize-td->rdist)/t->propsize;
switch(prop_mode) {
switch(G.scene->prop_mode) {
case PROP_SHARP:
td->factor= dist*dist;
break;
@@ -767,7 +767,7 @@ void calculatePropRatio(TransInfo *t)
}
}
}
switch(prop_mode) {
switch(G.scene->prop_mode) {
case PROP_SHARP:
strcpy(t->proptext, "(Sharp)");
break;