archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Removed casting warnings from transform_manipulator.

Browse Source 
PET is now checked as a transform flag during transform. Much cleaner that way for NOPET context (extrude, duplicate)
Added Sphere as a new PET falloff mode (icon and all) and reordered them around in a more logical fashion (IMHO).

Also brought back Subsurf toggle with Shift-O (was supposed to be for PET object mode but that was canned).
This commit is contained in:
Martin Poirier
2005-04-01 18:39:39 +00:00
parent d5aaba6c81
commit 312c8d146c
10 changed files with 1380 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/transform_generics.c
View File

@@ -387,6 +387,11 @@ void initTrans (TransInfo *t)
t->flag = 0;
/* setting PET flag */
if ((t->context & CTX_NOPET) == 0 && (G.f & G_PROPORTIONAL)) {
t->flag |= T_PROP_EDIT;
}
getmouseco_areawin(t->imval);
t->con.imval[0] = t->imval[0];
t->con.imval[1] = t->imval[1];
@@ -709,7 +714,7 @@ void calculatePropRatio(TransInfo *t)
float dist;
extern int prop_mode;
if (G.f & G_PROPORTIONAL) {
if (t->flag & T_PROP_EDIT) {
for(i = 0 ; i < t->total; i++, td++) {
if (td->flag & TD_SELECTED) {
td->factor = 1.0f;
@@ -742,7 +747,9 @@ void calculatePropRatio(TransInfo *t)
break;
case PROP_CONST:
td->factor = 1.0f;
//td->factor = (float)sqrt(2*dist - dist * dist);
break;
case PROP_SPHERE:
td->factor = (float)sqrt(2*dist - dist * dist);
break;
default:
td->factor = 1;
@@ -751,7 +758,7 @@ void calculatePropRatio(TransInfo *t)
}
switch(prop_mode) {
case PROP_SHARP:
strcpy(t->proptext, "(Quad)");
strcpy(t->proptext, "(Sharp)");
break;
case PROP_SMOOTH:
strcpy(t->proptext, "(Smooth)");
@@ -764,7 +771,9 @@ void calculatePropRatio(TransInfo *t)
break;
case PROP_CONST:
strcpy(t->proptext, "(Constant)");
//strcpy(t->proptext, "(Sphere)");
break;
case PROP_SPHERE:
strcpy(t->proptext, "(Sphere)");
break;
default:
strcpy(t->proptext, "");