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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-05-24 15:52:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-05-24 15:54:51 +0300
commit05a9788b254d4e168f7a46d406aadf34b449d465 (patch)
tree588e8a4bd4b5f0136d2ea298775db26e85941c3e /source/blender/makesrna/intern/rna_particle.c
parentfae58962493010f7c9c7d78f79e64165539f4317 (diff)
Fix T64101: Crash entering edit mode with particle system
Explicitly disable particles in edit for now. Those were not rendered already, but were attempted to be converted to Cycles structures (if UVs were not needed for hair nothing was rendered, but if UVs are needed then crash happened). Would be nice to bring hair in edit mode back, but this is a bit more involved change, which will be done later.
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
-rw-r--r--source/blender/makesrna/intern/rna_particle.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 641bf4128d0..a3178e0407f 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -534,6 +534,11 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem,
int uv_no,
float r_uv[2])
{
+ if (modifier->mesh_final == NULL) {
+ BKE_report(reports, RPT_ERROR, "Object was not yet evaluated");
+ zero_v2(r_uv);
+ return;
+ }
if (!CustomData_has_layer(&modifier->mesh_final->ldata, CD_MLOOPUV)) {
BKE_report(reports, RPT_ERROR, "Mesh has no UV data");
zero_v2(r_uv);