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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-27 06:54:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-27 06:54:24 +0400
commitac849f98f5262a0776f2b7df152675608b109d03 (patch)
tree5bb2ad0562a66c3d3a7c663b9dfdd63cd33c3142 /intern/cycles/render/mesh.h
parent2b640a2519a3d4fd822415b8be6d2efdc469b4f1 (diff)
Fix #35102: crash with experimental cycles displacement feature due to
uninitialized memory usage.
Diffstat (limited to 'intern/cycles/render/mesh.h')
-rw-r--r--intern/cycles/render/mesh.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 63d6b50ffca..b74c41f6453 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -140,7 +140,7 @@ public:
MeshManager();
~MeshManager();
- bool displace(Device *device, Scene *scene, Mesh *mesh, Progress& progress);
+ bool displace(Device *device, DeviceScene *dscene, Scene *scene, Mesh *mesh, Progress& progress);
/* attributes */
void update_osl_attributes(Device *device, Scene *scene, vector<AttributeRequestSet>& mesh_attributes);