kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #6078

Browse Source 
Transform Properties panel in 3d window:
Using TAB on size buttons didn't work well; the code was assuming events
with only 1 change per event.
This commit is contained in:
Ton Roosendaal 2007-04-09 10:01:46 +00:00
parent c48a676d47
commit 482d0346fe
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/src/drawview.c
View File

@ -1977,25 +1977,26 @@ void do_viewbuts(unsigned short event)
case B_OBJECTPANELSCALE: case B_OBJECTPANELSCALE:
if(ob) { if(ob) {
float ratio, tmp, max = 0.0;
int axis;
/* figure out which axis changed */ /* link scale; figure out which axis changed */
axis = 0; if (tfp->link_scale) {
max = fabs(tfp->ob_scale[0] - ob->size[0]); float ratio, tmp, max = 0.0;
tmp = fabs(tfp->ob_scale[1] - ob->size[1]); int axis;
if (tmp > max) {
axis = 1;
max = tmp;
}
tmp = fabs(tfp->ob_scale[2] - ob->size[2]);
if (tmp > max) {
axis = 2;
max = tmp;
}
if (ob->size[axis] != tfp->ob_scale[axis]) { axis = 0;
if (tfp->link_scale) { max = fabs(tfp->ob_scale[0] - ob->size[0]);
tmp = fabs(tfp->ob_scale[1] - ob->size[1]);
if (tmp > max) {
axis = 1;
max = tmp;
}
tmp = fabs(tfp->ob_scale[2] - ob->size[2]);
if (tmp > max) {
axis = 2;
max = tmp;
}
if (ob->size[axis] != tfp->ob_scale[axis]) {
if (fabs(ob->size[axis]) > FLT_EPSILON) { if (fabs(ob->size[axis]) > FLT_EPSILON) {
ratio = tfp->ob_scale[axis] / ob->size[axis]; ratio = tfp->ob_scale[axis] / ob->size[axis];
ob->size[0] *= ratio; ob->size[0] *= ratio;
@ -2003,11 +2004,13 @@ void do_viewbuts(unsigned short event)
ob->size[2] *= ratio; ob->size[2] *= ratio;
} }
} }
ob->size[axis] = tfp->ob_scale[axis];
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 1);
} }
else {
VECCOPY(ob->size, tfp->ob_scale);
}
DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 1);
} }
break; break;