diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-17 20:03:08 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-17 20:03:08 +0300 |
| commit | 8400b4b566350bd9d726a07627e74f5a995280da (patch) | |
| tree | 17fa5e2ef420295be4a210d00476fe1d0081bbfb /source/blender/depsgraph/intern/depsgraph.cc | |
| parent | 10e6da1f2d61b9db7c47257310eb4580aa096c50 (diff) | |
| parent | 46204f843b5710dabb99e194aee5e3202b9688e4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 45013bb1bcd..128dfd0e556 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -204,11 +204,7 @@ static bool pointer_to_component_node_criteria( } } else if (ptr->type == &RNA_ShapeKey) { - Key *key = (Key *)ptr->id.data; - /* ShapeKeys are currently handled as geometry on the geometry that - * owns it. - */ - *id = key->from; + *id = (ID *)ptr->id.data; *type = DEG_NODE_TYPE_GEOMETRY; return true; } |