Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-04-27 12:37:20 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-04-27 17:40:45 +0300
commit4fd005fefb014a8570747b1d043de7d610078b46 (patch)
treeed699df29fa0048707cb44a2d3e5ca7323caac88 /source/blender/draw/intern/draw_cache_extract_mesh.c
parent8f289196cfd8c6f5ca8700576d9b5e011bdc8e5a (diff)
Fix T76131: Crash combing Hair using Python
Caused by rBe82827bf6ed5. DRW_draw_depth_object calls DRW_mesh_batch_cache_create_requested with NULL scene, but that is accessed later on... Scene is actually available, so pass that around. Maniphest Tasks: T76131 Differential Revision: https://developer.blender.org/D7540
Diffstat (limited to 'source/blender/draw/intern/draw_cache_extract_mesh.c')
-rw-r--r--source/blender/draw/intern/draw_cache_extract_mesh.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c
index 4c51ed99f2c..40687306b4e 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.c
@@ -4540,6 +4540,7 @@ static void extract_task_create(TaskPool *task_pool,
void *buf,
int32_t *task_counter)
{
+ BLI_assert(scene != NULL);
const bool do_hq_normals = (scene->r.perf_flag & SCE_PERF_HQ_NORMALS) != 0;
if (do_hq_normals && (extract == &extract_lnor)) {
extract = &extract_lnor_hq;