diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-05-03 14:54:42 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-05-03 14:54:42 +0400 |
| commit | 422b69fe1ec7f4fbce9a1adff2a3924b454a9941 (patch) | |
| tree | 44dfdfe02c24e8b9f909c159d17d0277510bb42f /source/blender/include | |
| parent | cdca939c2cd4c382f2713b14bc95b7e6a9d1455f (diff) | |
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.
Diffstat (limited to 'source/blender/include')
| -rw-r--r-- | source/blender/include/BIF_resources.h | 18 | ||||
| -rwxr-xr-x | source/blender/include/BIF_transform.h | 7 |
2 files changed, 9 insertions, 16 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index e0b08717651..a922bea1b19 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -258,15 +258,15 @@ typedef enum { ICON_CAMERA_DEHLT, ICON_ARMATURE_DEHLT, - ICON_SHARPCURVE, ICON_SMOOTHCURVE, + ICON_SPHERECURVE, ICON_ROOTCURVE, + ICON_SHARPCURVE, ICON_LINCURVE, ICON_NOCURVE, - ICON_BLANK46, - ICON_BLANK47, - ICON_BLANK48, - ICON_BLANK49, + ICON_PROP_OFF, + ICON_PROP_ON, + ICON_PROP_CON, ICON_BLANK50, ICON_BLANK51, ICON_BLANK52, @@ -280,13 +280,13 @@ typedef enum { ICON_BLANK60, ICON_BLANK61, - ICON_BLANK65, - ICON_BLANK66, - ICON_BLANK67, - ICON_MANIPUL, ICON_MAN_TRANS, ICON_MAN_ROT, ICON_MAN_SCALE, + ICON_MANIPUL, + ICON_BLANK65, + ICON_BLANK66, + ICON_BLANK67, ICON_BLANK68, ICON_BLANK69, ICON_BLANK70, diff --git a/source/blender/include/BIF_transform.h b/source/blender/include/BIF_transform.h index 1557f87d039..88170fe14b5 100755 --- a/source/blender/include/BIF_transform.h +++ b/source/blender/include/BIF_transform.h @@ -58,13 +58,6 @@ #define CTX_NO_NOR_RECALC 8 #define CTX_SETLOCALCONST 16 -/* TRANSFORM PROPORTIONAL FALLOFF MODES */ -#define PROP_SHARP 0 -#define PROP_LIN 1 -#define PROP_ROOT 2 -#define PROP_SPHERE 3 -#define PROP_CONST 4 -#define PROP_SMOOTH 5 void Transform(int mode, int context); |