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/DRW_engine.h
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/DRW_engine.h')
-rw-r--r--source/blender/draw/DRW_engine.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 7ecf9df275d..1bdc3bc5a03 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -118,7 +118,8 @@ void DRW_draw_depth_loop_gpencil(struct Depsgraph *depsgraph,
struct ARegion *region,
struct View3D *v3d,
struct GPUViewport *viewport);
-void DRW_draw_depth_object(struct ARegion *region,
+void DRW_draw_depth_object(struct Scene *scene,
+ struct ARegion *region,
struct View3D *v3d,
struct GPUViewport *viewport,
struct Object *object);