diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-05-03 19:33:02 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-05-03 19:33:02 +0300 |
| commit | 82e242cc7287ce56d10f88a76de5418a7b20e239 (patch) | |
| tree | c513d6537cfd3d3a1b3d098a8a4f45c55611f165 /source/blender/draw/engines/basic | |
| parent | 2564d929fc5f75403bc5ca051fb33bc7b8874646 (diff) | |
| parent | 15189baa5231d70c1363192eb01b83fa946f36f0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/engines/basic')
| -rw-r--r-- | source/blender/draw/engines/basic/basic_engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index bdcdefe414a..169c67f9702 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -248,7 +248,7 @@ DrawEngineType draw_engine_basic_type = { RenderEngineType DRW_engine_viewport_basic_type = { NULL, NULL, BASIC_ENGINE, N_("Basic"), RE_INTERNAL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &draw_engine_basic_type, {NULL, NULL, NULL} }; |