diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
| commit | 5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89 (patch) | |
| tree | 478091477aea6fc67186cfcf2ddcd17a214b1366 /source/blender/editors/interface/interface_layout.c | |
| parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
| parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_layout.c')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index a67a7740908..ac7bbb12912 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1811,7 +1811,8 @@ static void search_id_collection(StructRNA *ptype, PointerRNA *ptr, PropertyRNA StructRNA *srna; /* look for collection property in Main */ - RNA_main_pointer_create(G.main, ptr); + /* Note: using global Main is OK-ish here, UI shall not access other Mains anyay... */ + RNA_main_pointer_create(G_MAIN, ptr); *prop = NULL; |