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
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-28 18:14:30 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-28 18:14:30 +0300
commita8c0a57fc3eb0f8c3aeeb2de083a0e06b06cef7e (patch)
tree0eea8ae5ab501db8d18f0809cc1dfcebb9b70a3c /source
parent56cc21907042dfbeb9901cb5791bda9a5244e864 (diff)
Fix T60599: Multires crash after doing dyntopo sculpt
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/subdiv_displacement_multires.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.c b/source/blender/blenkernel/intern/subdiv_displacement_multires.c
index 5727c8d487b..638f7200145 100644
--- a/source/blender/blenkernel/intern/subdiv_displacement_multires.c
+++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.c
@@ -479,6 +479,11 @@ void BKE_subdiv_displacement_attach_from_multires(
{
/* Make sure we don't have previously assigned displacement. */
BKE_subdiv_displacement_detach(subdiv);
+ /* It is possible to have mesh without MDISPS layer. Happens when using
+ * dynamic topology. */
+ if (!CustomData_has_layer(&mesh->ldata, CD_MDISPS)) {
+ return;
+ }
/* Allocate all required memory. */
SubdivDisplacement *displacement = MEM_callocN(sizeof(SubdivDisplacement),
"multires displacement");