Commit: 611e544191fa7fa89ed299c5aa3ab9ea5a82bdfe
Author: Bastien Montagne
Date: Mon Mar 28 15:37:08 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB611e544191fa7fa89ed299c5aa3ab9ea5a82bdfe
Fix T47972: Blender crash showing particle system.
Do same as with faces - if no orcodata is available, fill orco with current
location...
===================================================================
M source/blender/blenkernel/intern/particle.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index 364bdbb..221bb6d 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1609,8 +1609,14 @@ void psys_particle_on_dm(DerivedMesh *dm_final, int
from, int index, int index_d
normalize_v3(nor);
}
- if (orco)
- copy_v3_v3(orco, orcodata[mapindex]);
+ if (orco) {
+ if (orcodata) {
+ copy_v3_v3(orco, orcodata[mapindex]);
+ }
+ else {
+ copy_v3_v3(orco, vec);
+ }
+ }
if (ornor) {
dm_final->getVertNo(dm_final, mapindex, ornor);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
