diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-30 18:54:21 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-30 18:54:21 +0300 |
| commit | 342c900220ce35f66ceabbbc8347512e66128420 (patch) | |
| tree | f59b0b6d48f7a56629ea1236bade0a586f0e51dd /source/blender/src/editconstraint.c | |
| parent | 9711d54fb734522102f0c95f661391cb3ca723a2 (diff) | |
Proxy Objects revisited!
The first incarnation assumed that proxies were local objects per
definition. Unfortunately that makes it impossible to - for example -
reference-link an entire Scene with proxies, to be used as a special
character set.
This commit makes the proxy implementation also a bit more clear.
Related work: the scene-sets were not executed fully or correctly for
the dependency graph. That happens now (in 3d view) as well.
Diffstat (limited to 'source/blender/src/editconstraint.c')
| -rw-r--r-- | source/blender/src/editconstraint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/editconstraint.c b/source/blender/src/editconstraint.c index 178acf51b1d..2ee40396061 100644 --- a/source/blender/src/editconstraint.c +++ b/source/blender/src/editconstraint.c @@ -620,7 +620,7 @@ void add_constraint(int only_IK) if(pchanact==NULL) return; /* check protection */ - if(OB_IS_PROXY(ob) && (pchanact->bone->layer & arm->layer_protected)) { + if(ob->proxy && (pchanact->bone->layer & arm->layer_protected)) { error("Bone is Proxy protected"); return; } |