diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 14:12:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 14:12:07 +0400 |
| commit | 0d5d2146ebc026c254fc68e4970a1dfb3a9b5b31 (patch) | |
| tree | 1182edf4d10ae0dd65fde371d46be6baf9435b25 /source/blender/editors/space_view3d | |
| parent | f5d3e361cec686fe90faba9c8bc1681b595243b3 (diff) | |
code cleanup: make shape key api names consistent with our new convention.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index e88f49d4f5b..8da74787403 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3620,7 +3620,7 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D } if (obedit && ob != obedit && ob->data == obedit->data) { - if (ob_get_key(ob) || ob_get_key(obedit)) {} + if (BKE_key_from_object(ob) || BKE_key_from_object(obedit)) {} else if (ob->modifiers.first || obedit->modifiers.first) {} else drawlinked = 1; } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 72f82b4aec5..8b1ecf437f3 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -901,7 +901,7 @@ static void draw_selected_name(Scene *scene, Object *ob) /* try to display active shapekey too */ shapes[0] = '\0'; - key = ob_get_key(ob); + key = BKE_key_from_object(ob); if (key) { kb = BLI_findlink(&key->block, ob->shapenr - 1); if (kb) { |