[Bf-blender-cvs] [d336bb0] master: Fix T47972: Blender crash showing particle system.

Bastien Montagne noreply at git.blender.org
Mon Mar 28 15:53:12 CEST 2016


Commit: d336bb0765e8175e93e4f9d2c024e258a8c992e5
Author: Bastien Montagne
Date:   Mon Mar 28 15:37:08 2016 +0200
Branches: master
https://developer.blender.org/rBd336bb0765e8175e93e4f9d2c024e258a8c992e5

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 081244c..0b88533 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);




More information about the Bf-blender-cvs mailing list