diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 09:10:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 09:10:45 +0300 |
commit | 58a4c767a14b60b903fbe5c5e7e960c57212faeb (patch) | |
tree | 8483aebad87ecc50cdeb8f76e861c755efb2cbd7 /source/blender/makesrna/intern/rna_render.c | |
parent | 9cfb72ff81a36c26f4b611ec733432968f15a2de (diff) | |
parent | b8d77c44f112cae1e98308ff33ce055ea4fb46ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_render.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 7bcf116d6b7..b5115aa3978 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -341,6 +341,9 @@ static StructRNA *rna_RenderEngine_register(Main *bmain, ReportList *reports, vo break; } } + if (!RNA_struct_available_or_report(reports, identifier)) { + return NULL; + } /* create a new engine type */ et = MEM_callocN(sizeof(RenderEngineType), "python render engine"); |