diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-23 02:11:32 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-23 02:11:32 +0300 |
| commit | c4a71795f59ccbdc0ed7c77158b5bfd78a018fe4 (patch) | |
| tree | fe5a5d724f4df91718e8a6b480b1c541274d8a6b /source/blender/editors/object/object_relations.c | |
| parent | d83b251486346e8a094e1a81c186ca98e2e88d0f (diff) | |
Bugfixes:
* Restored Center View to 3D Cursor. For now, I've mapped this to QKEY since all other nice combinations of CKEY have been taken now.
* Fixed bug introduced in commit last night where parenting lattice to armatures with deforms would no longer work.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index dd8d2b4e9cc..a6feefa2c5e 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -653,8 +653,8 @@ static int parent_set_exec(bContext *C, wmOperator *op) //ob->partype= PARSKEL; /* note, dna define, not operator property */ /* BUT, to keep the deforms, we need a modifier, and then we need to set the object that it uses */ - // XXX currently this should only happen for meshes, curves and surfaces - this stuff isn't available for metas yet - if (ELEM4(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) + // XXX currently this should only happen for meshes, curves, surfaces, and lattices - this stuff isn't available for metas yet + if (ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) { switch (partype) { |