From d407aeecc7f2d45422ff14aea88276edf244aa7a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 Apr 2013 11:28:42 +0000 Subject: code cleanup: use more (blender) conventional naming for group functions. also change dump_rna2xml.py to dump bpy.data by default. --- source/blender/blenkernel/intern/object.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/object.c') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 8d3e92975fe..c2e3d7496e9 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -760,7 +760,7 @@ void BKE_object_unlink(Object *ob) /* groups */ group = bmain->group.first; while (group) { - rem_from_group(group, ob, NULL, NULL); + BKE_group_object_unlink(group, ob, NULL, NULL); group = group->id.next; } @@ -3392,7 +3392,7 @@ struct LinkNode *BKE_object_groups(Object *ob) { LinkNode *group_linknode = NULL; Group *group = NULL; - while ((group = find_group(ob, group))) { + while ((group = BKE_group_object_find(group, ob))) { BLI_linklist_prepend(&group_linknode, group); } @@ -3409,7 +3409,7 @@ void BKE_object_groups_clear(Scene *scene, Base *base, Object *object) base = BKE_scene_base_find(scene, object); } - while ((group = find_group(base->object, group))) { - rem_from_group(group, object, scene, base); + while ((group = BKE_group_object_find(group, base->object))) { + BKE_group_object_unlink(group, object, scene, base); } } -- cgit v1.2.3 From 2804caff4ce6c9f6d5ebdd101e77c92b7ac65db4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Apr 2013 04:22:38 +0000 Subject: code cleanup: use bools, (float)sin/(float)cos -> sinf/cosf, more meaningful var names. --- source/blender/blenkernel/intern/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/object.c') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index c2e3d7496e9..5e0ed369733 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1837,8 +1837,8 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[4][4]) /* the tilt */ normalize_v3(dir); - q[0] = (float)cos(0.5 * vec[3]); - si = (float)sin(0.5 * vec[3]); + q[0] = cosf(0.5 * vec[3]); + si = sinf(0.5 * vec[3]); q[1] = -si * dir[0]; q[2] = -si * dir[1]; q[3] = -si * dir[2]; -- cgit v1.2.3