[Bf-blender-cvs] [cf751e3914a] master: Merge branch 'blender-v2.91-release'

[Brecht Van Lommel]

Commit: cf751e3914abb95f160ad9030c80f71cd2362816
Author: Brecht Van Lommel
Date:   Mon Nov 9 18:50:56 2020 +0100
Branches: master
https://developer.blender.org/rBcf751e3914abb95f160ad9030c80f71cd2362816

Merge branch 'blender-v2.91-release'

===================================================================



===================================================================

diff --cc source/blender/render/intern/engine.c
index 9a3dc0d000c,31b20008b52..84f12b7873b
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@@ -811,9 -867,10 +866,9 @@@ int RE_engine_render(Render *re, int do
    /* set render info */
    re->i.cfra = re->scene->r.cfra;
    BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name));
 -  re->i.totface = re->i.totvert = re->i.totlamp = 0;
  
    /* render */
-   engine = re->engine;
+   RenderEngine *engine = re->engine;
  
    if (!engine) {
      engine = RE_engine_create(type);