Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-05-03 14:54:42 +0400
committerTon Roosendaal <ton@blender.org>2005-05-03 14:54:42 +0400
commit422b69fe1ec7f4fbce9a1adff2a3924b454a9941 (patch)
tree44dfdfe02c24e8b9f909c159d17d0277510bb42f /source/blender/src/editsima.c
parentcdca939c2cd4c382f2713b14bc95b7e6a9d1455f (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/src/editsima.c')
-rw-r--r--source/blender/src/editsima.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index 93582d1b76b..cff2546e6ee 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -359,12 +359,11 @@ void transform_tface_uv(int mode, int context) // 2 args, for callback
short mval[2], val, xo, yo, xn, yn, xc, yc;
char str[80];
extern float prop_size, prop_cent[3];
- extern int prop_mode;
if( is_uv_tface_editing_allowed()==0 ) return;
me= get_mesh(OBACT);
- if(G.f & G_PROPORTIONAL) propmode= 1;
+ if(G.scene->proportional) propmode= 1;
min[0]= min[1]= 10000.0;
max[0]= max[1]= -10000.0;
@@ -488,7 +487,7 @@ void transform_tface_uv(int mode, int context) // 2 args, for callback
else if(dist > prop_size) tv->fac= 0.0;
else {
dist= (prop_size-dist)/prop_size;
- if(prop_mode==1)
+ if(G.scene->prop_mode==1)
tv->fac= 3.0*dist*dist - 2.0*dist*dist*dist;
else tv->fac= dist*dist;
}