Commit: 06b51c64ad7cbf73dc0bc9c31060ffff0b778898
Author: Sergey Sharybin
Date: Fri Sep 23 15:39:33 2016 +0200
Branches: master
https://developer.blender.org/rB06b51c64ad7cbf73dc0bc9c31060ffff0b778898
Particles: Prevent crash when copying to an object with subsurf modifier
Probably something will be remapped wrongly, but better than crash.
===================================================================
M source/blender/editors/physics/particle_object.c
===================================================================
diff --git a/source/blender/editors/physics/particle_object.c
b/source/blender/editors/physics/particle_object.c
index 895d791..4a44748 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -697,6 +697,9 @@ static bool remap_hair_emitter(Scene *scene, Object *ob,
ParticleSystem *psys,
dm = target_psmd->dm_deformed;
}
target_dm = target_psmd->dm_final;
+ if (dm == NULL) {
+ return false;
+ }
/* don't modify the original vertices */
dm = CDDM_copy(dm);
@@ -1078,7 +1081,7 @@ static bool copy_particle_systems_to_object(Main *bmain,
copy_particle_edit(scene, ob_to, psys, psys_from);
if (duplicate_settings) {
- id_us_min(psys->part);
+ id_us_min(&psys->part->id);
psys->part = BKE_particlesettings_copy(bmain,
psys->part);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
