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:
authorMartin Poirier <theeth@yahoo.com>2003-11-17 05:25:33 +0300
committerMartin Poirier <theeth@yahoo.com>2003-11-17 05:25:33 +0300
commitb43e74a1db8d2f448395d5b4656d1c53cd86f9ca (patch)
treebfa75ca7c574c462f446f4baa5afff7d24ebbcf9 /source/blender/src/editconstraint.c
parent12a5ea3e672dafb167907a8ea6224b7955bd4eb9 (diff)
Fixed the fix for constraint loop :P
Everything works properly now
Diffstat (limited to 'source/blender/src/editconstraint.c')
-rw-r--r--source/blender/src/editconstraint.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/editconstraint.c b/source/blender/src/editconstraint.c
index 31e517046b6..4f3e4d40513 100644
--- a/source/blender/src/editconstraint.c
+++ b/source/blender/src/editconstraint.c
@@ -501,9 +501,10 @@ static short detect_constraint_loop (Object *owner, const char* substring, int d
// return 1;
}
}
- if (typefrom == CONSTRAINT_TYPE_TRACKTO && typefrom == CONSTRAINT_TYPE_LOCKTRACK){
+ else {
curcon->flag |= CONSTRAINT_NOREFRESH;
}
+
if (detect_constraint_loop (data->tar, data->subtarget, disable, CONSTRAINT_TYPE_TRACKTO)){
curcon->flag |= CONSTRAINT_DISABLE;
result = 1;
@@ -541,9 +542,10 @@ static short detect_constraint_loop (Object *owner, const char* substring, int d
// return 1;
}
}
- if (typefrom == CONSTRAINT_TYPE_TRACKTO && typefrom == CONSTRAINT_TYPE_LOCKTRACK){
+ else {
curcon->flag |= CONSTRAINT_NOREFRESH;
}
+
if (detect_constraint_loop (data->tar, data->subtarget, disable, CONSTRAINT_TYPE_LOCKTRACK)){
curcon->flag |= CONSTRAINT_DISABLE;
result = 1;