blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix crash when switching back from render preview. 

Issue is that external engine uses the gpu info. but overwrote the
instance data. The draw manager would then detect instance data and
required the engine type to have a instance free callback.

The solution is to save some space in the engine data to hold an empty
and unused instance_data attribute to comply with `ViewportEngineData`
struct.
This commit is contained in:
Jeroen Bakker 2021-12-07 11:30:50 +01:00
parent b069218a55
commit cd494087c1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/eevee/eevee_private.h
View File

@ -992,6 +992,8 @@ typedef struct EEVEE_Data {
EEVEE_TextureList *txl;
EEVEE_PassList *psl;
EEVEE_StorageList *stl;
void *instance_data;
char info[GPU_INFO_SIZE];
} EEVEE_Data;

2
source/blender/draw/engines/external/external_engine.c vendored
View File

@ -88,6 +88,8 @@ typedef struct EXTERNAL_Data {
EXTERNAL_TextureList *txl;
EXTERNAL_PassList *psl;
EXTERNAL_StorageList *stl;
void *instance_data;
char info[GPU_INFO_SIZE];
} EXTERNAL_Data;