diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 15:28:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 15:28:42 +0400 |
| commit | d407aeecc7f2d45422ff14aea88276edf244aa7a (patch) | |
| tree | feda0dbc8cf2959e71e2660849ecd88f7e764fcc /source/blender/makesrna/intern/rna_object.c | |
| parent | efa4c5be4bb11604e211f8eb26eee9d54ca09cb4 (diff) | |
code cleanup: use more (blender) conventional naming for group functions.
also change dump_rna2xml.py to dump bpy.data by default.
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 594b86f000c..0c01d03888d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -43,7 +43,7 @@ #include "BKE_paint.h" #include "BKE_tessmesh.h" -#include "BKE_group.h" /* needed for object_in_group() */ +#include "BKE_group.h" /* needed for BKE_group_object_exists() */ #include "RNA_access.h" #include "RNA_define.h" @@ -520,7 +520,7 @@ static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value) /* must not let this be set if the object belongs in this group already, * thus causing a cycle/infinite-recursion leading to crashes on load [#25298] */ - if (object_in_group(ob, grp) == 0) + if (BKE_group_object_exists(grp, ob) == 0) ob->dup_group = grp; else BKE_report(NULL, RPT_ERROR, |