[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55755] trunk/blender: code cleanup: use more (blender) conventional naming for group functions.
Campbell Barton
ideasman42 at gmail.com
Wed Apr 3 13:28:43 CEST 2013
Revision: 55755
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55755
Author: campbellbarton
Date: 2013-04-03 11:28:42 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
code cleanup: use more (blender) conventional naming for group functions.
also change dump_rna2xml.py to dump bpy.data by default.
Modified Paths:
--------------
trunk/blender/intern/tools/dump_rna2xml.py
trunk/blender/source/blender/blenkernel/BKE_group.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_group.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/physics/rigidbody_constraint.c
trunk/blender/source/blender/editors/physics/rigidbody_object.c
trunk/blender/source/blender/makesrna/intern/rna_group.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/intern/tools/dump_rna2xml.py
===================================================================
--- trunk/blender/intern/tools/dump_rna2xml.py 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/intern/tools/dump_rna2xml.py 2013-04-03 11:28:42 UTC (rev 55755)
@@ -38,7 +38,7 @@
file = open(filename, 'w')
- if 0:
+ if 1:
# blend file
rna_xml.rna2xml(file.write,
root_rna=bpy.data,
Modified: trunk/blender/source/blender/blenkernel/BKE_group.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_group.h 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/BKE_group.h 2013-04-03 11:28:42 UTC (rev 55755)
@@ -41,18 +41,17 @@
struct bAction;
struct Scene;
-void BKE_group_free(struct Group *group);
-void BKE_group_unlink(struct Group *group);
-struct Group *add_group(struct Main *bmain, const char *name);
+void BKE_group_free(struct Group *group);
+void BKE_group_unlink(struct Group *group);
+struct Group *BKE_group_add(struct Main *bmain, const char *name);
struct Group *BKE_group_copy(struct Group *group);
-int add_to_group(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
-int rem_from_group(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
-struct Group *find_group(struct Object *ob, struct Group *group);
-int object_in_group(struct Object *ob, struct Group *group);
-int group_is_animated(struct Object *parent, struct Group *group);
+bool BKE_group_object_add(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
+bool BKE_group_object_unlink(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
+struct Group *BKE_group_object_find(struct Group *group, struct Object *ob);
+bool BKE_group_object_exists(struct Group *group, struct Object *ob);
+bool BKE_group_is_animated(struct Group *group, struct Object *parent);
-void group_tag_recalc(struct Group *group);
-void group_handle_recalc_and_update(struct Scene *scene, struct Object *parent, struct Group *group);
+void BKE_group_tag_recalc(struct Group *group);
+void BKE_group_handle_recalc_and_update(struct Scene *scene, struct Object *parent, struct Group *group);
-#endif
-
+#endif /* __BKE_GROUP_H__ */
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-03 11:28:42 UTC (rev 55755)
@@ -766,10 +766,10 @@
if (flag & DUPLILIST_DO_UPDATE) {
/* note: update is optional because we don't always need object
* transformations to be correct. Also fixes bug [#29616]. */
- group_handle_recalc_and_update(scene, ob, group);
+ BKE_group_handle_recalc_and_update(scene, ob, group);
}
- if (group_is_animated(ob, group))
+ if (BKE_group_is_animated(group, ob))
flag |= DUPLILIST_ANIMATED;
for (go = group->gobject.first, id = 0; go; go = go->next, id++) {
@@ -1331,7 +1331,7 @@
/* gather list of objects or single object */
if (part->ren_as == PART_DRAW_GR) {
if (flag & DUPLILIST_DO_UPDATE) {
- group_handle_recalc_and_update(scene, par, part->dup_group);
+ BKE_group_handle_recalc_and_update(scene, par, part->dup_group);
}
if (part->draw & PART_DRAW_COUNT_GR) {
Modified: trunk/blender/source/blender/blenkernel/intern/group.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/group.c 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/intern/group.c 2013-04-03 11:28:42 UTC (rev 55755)
@@ -94,7 +94,9 @@
/* ensure objects are not in this group */
for (; base; base = base->next) {
- if (rem_from_group(group, base->object, sce, base) && find_group(base->object, NULL) == NULL) {
+ if (BKE_group_object_unlink(group, base->object, sce, base) &&
+ BKE_group_object_find(NULL, base->object) == NULL)
+ {
base->object->flag &= ~OB_FROMGROUP;
base->flag &= ~OB_FROMGROUP;
}
@@ -127,7 +129,7 @@
group->id.us = 0;
}
-Group *add_group(Main *bmain, const char *name)
+Group *BKE_group_add(Main *bmain, const char *name)
{
Group *group;
@@ -147,7 +149,7 @@
}
/* external */
-static int add_to_group_internal(Group *group, Object *ob)
+static int group_object_add_internal(Group *group, Object *ob)
{
GroupObject *go;
@@ -168,9 +170,9 @@
return TRUE;
}
-int add_to_group(Group *group, Object *object, Scene *scene, Base *base)
+bool BKE_group_object_add(Group *group, Object *object, Scene *scene, Base *base)
{
- if (add_to_group_internal(group, object)) {
+ if (group_object_add_internal(group, object)) {
if ((object->flag & OB_FROMGROUP) == 0) {
if (scene && base == NULL)
@@ -181,15 +183,15 @@
if (base)
base->flag |= OB_FROMGROUP;
}
- return 1;
+ return true;
}
else {
- return 0;
+ return false;
}
}
/* also used for (ob == NULL) */
-static int rem_from_group_internal(Group *group, Object *ob)
+static int group_object_unlink_internal(Group *group, Object *ob)
{
GroupObject *go, *gon;
int removed = 0;
@@ -209,11 +211,11 @@
return removed;
}
-int rem_from_group(Group *group, Object *object, Scene *scene, Base *base)
+bool BKE_group_object_unlink(Group *group, Object *object, Scene *scene, Base *base)
{
- if (rem_from_group_internal(group, object)) {
+ if (group_object_unlink_internal(group, object)) {
/* object can be NULL */
- if (object && find_group(object, NULL) == NULL) {
+ if (object && BKE_group_object_find(NULL, object) == NULL) {
if (scene && base == NULL)
base = BKE_scene_base_find(scene, object);
@@ -222,23 +224,24 @@
if (base)
base->flag &= ~OB_FROMGROUP;
}
- return 1;
+ return true;
}
else {
- return 0;
+ return false;
}
}
-int object_in_group(Object *ob, Group *group)
+bool BKE_group_object_exists(Group *group, Object *ob)
{
if (group == NULL || ob == NULL) {
- return FALSE;
+ return false;
}
-
- return (BLI_findptr(&group->gobject, ob, offsetof(GroupObject, ob)) != NULL);
+ else {
+ return (BLI_findptr(&group->gobject, ob, offsetof(GroupObject, ob)) != NULL);
+ }
}
-Group *find_group(Object *ob, Group *group)
+Group *BKE_group_object_find(Group *group, Object *ob)
{
if (group)
group = group->id.next;
@@ -246,14 +249,14 @@
group = G.main->group.first;
while (group) {
- if (object_in_group(ob, group))
+ if (BKE_group_object_exists(group, ob))
return group;
group = group->id.next;
}
return NULL;
}
-void group_tag_recalc(Group *group)
+void BKE_group_tag_recalc(Group *group)
{
GroupObject *go;
@@ -265,7 +268,7 @@
}
}
-int group_is_animated(Object *UNUSED(parent), Group *group)
+bool BKE_group_is_animated(Group *group, Object *UNUSED(parent))
{
GroupObject *go;
@@ -276,9 +279,9 @@
for (go = group->gobject.first; go; go = go->next)
if (go->ob && go->ob->proxy)
- return 1;
+ return true;
- return 0;
+ return false;
}
#if 0 // add back when timeoffset & animsys work again
@@ -327,7 +330,7 @@
* you can draw everything, leaves tags in objects to signal it needs further updating */
/* note: does not work for derivedmesh and render... it recreates all again in convertblender.c */
-void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group *group)
+void BKE_group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group *group)
{
GroupObject *go;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2013-04-03 11:28:42 UTC (rev 55755)
@@ -760,7 +760,7 @@
/* 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 @@
{
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 @@
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);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2013-04-03 11:28:42 UTC (rev 55755)
@@ -314,7 +314,7 @@
/* first remove all weights that don't have an object in the group */
dw = part->dupliweights.first;
while (dw) {
- if (!object_in_group(dw->ob, part->dup_group)) {
+ if (!BKE_group_object_exists(part->dup_group, dw->ob)) {
tdw = dw->next;
BLI_freelinkN(&part->dupliweights, dw);
dw = tdw;
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-03 10:45:13 UTC (rev 55754)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-03 11:28:42 UTC (rev 55755)
@@ -1079,7 +1079,7 @@
if (go->ob)
go->ob->recalc |= recalc;
}
- group_handle_recalc_and_update(scene_parent, ob, ob->dup_group);
+ BKE_group_handle_recalc_and_update(scene_parent, ob, ob->dup_group);
}
}
}
@@ -1122,7 +1122,7 @@
BKE_object_handle_update_ex(scene_parent, ob, scene->rigidbody_world);
if (ob->dup_group && (ob->transflag & OB_DUPLIGROUP))
- group_handle_recalc_and_update(scene_parent, ob, ob->dup_group);
+ BKE_group_handle_recalc_and_update(scene_parent, ob, ob->dup_group);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list