diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 12:37:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 12:37:47 +0300 |
| commit | cbf5c738d6edaa3e5feecab6a97327cbfd96e06e (patch) | |
| tree | ea06760f7501bf735d9a6dc6c8242da59f3db671 /source/blender/python/intern/bpy_rna_id_collection.c | |
| parent | 1870a1adc75dece1e9eac3aa632da6e903780c86 (diff) | |
Cleanup: get rid of last G.main's in bpy area.
Essentially 'validating' them as G_MAIN, and adding some asserts in
dubious places, that handled IDs are actually in G_MAIN.
Diffstat (limited to 'source/blender/python/intern/bpy_rna_id_collection.c')
| -rw-r--r-- | source/blender/python/intern/bpy_rna_id_collection.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index ee40d30d73b..4806c2266ba 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -160,7 +160,7 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject * BPy_StructRNA *pyrna = (BPy_StructRNA *)self; Main *bmain = pyrna->ptr.data; #else - Main *bmain = G.main; /* XXX Ugly, but should work! */ + Main *bmain = G_MAIN; /* XXX Ugly, but should work! */ #endif PyObject *subset = NULL; @@ -230,7 +230,6 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject * lb_index = set_listbasepointers(bmain, lb_array); while (lb_index--) { - if (val_types_bitmap && lb_array[lb_index]->first) { if (!id_check_type(lb_array[lb_index]->first, val_types_bitmap)) { continue; |