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

Push/Pull didn't do Lock Constraint correctly. Fixed.

Browse Source 
Also added an isLockConstraint function that tells if the current constraint is a locking constraint or not.
This commit is contained in:
Martin Poirier
2005-05-29 09:21:34 +00:00
parent eeb6adffd3
commit 14a3166685
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/transform.h
View File

@@ -275,6 +275,8 @@ void drawConstraint();
//void drawPropCircle(TransInfo *t);
void drawPropCircle();
int isLockConstraint(TransInfo *t);
void initConstraint(TransInfo *t);
void startConstraint(TransInfo *t);
void stopConstraint(TransInfo *t);

9
source/blender/src/transform.c
View File

@@ -1988,7 +1988,14 @@ int PushPull(TransInfo *t, short mval[2])
VecSubf(vec, t->center, td->center);
if (t->con.applyRot && t->con.mode & CON_APPLY) {
t->con.applyRot(t, td, axis);
Projf(vec, vec, axis);
if (isLockConstraint(t)) {
float dvec[3];
Projf(dvec, vec, axis);
VecSubf(vec, vec, dvec);
}
else {
Projf(vec, vec, axis);
}
}
Normalise(vec);
VecMulf(vec, distance);

15
source/blender/src/transform_constraints.c
View File

@@ -739,6 +739,21 @@ void BIF_drawPropCircle()
}
}
int isLockConstraint(TransInfo *t) {
int mode = t->con.mode;
if (mode & (CON_AXIS0|CON_AXIS1) == (CON_AXIS0|CON_AXIS1))
return 1;
if (mode & (CON_AXIS1|CON_AXIS2) == (CON_AXIS1|CON_AXIS2))
return 1;
if (mode & (CON_AXIS0|CON_AXIS2) == (CON_AXIS0|CON_AXIS2))
return 1;
return 0;
}
void initConstraint(TransInfo *t) {
if (t->con.mode & CON_APPLY) {
startConstraint(t);