[Bf-blender-cvs] [3ac7066] master: Fix crash reading ParticleEdit.is_editable

Campbell Barton noreply at git.blender.org
Tue Sep 9 14:18:40 CEST 2014


Commit: 3ac70665b01285db60e3452ea4d16fb9c7416319
Author: Campbell Barton
Date:   Tue Sep 9 22:07:55 2014 +1000
Branches: master
https://developer.blender.org/rB3ac70665b01285db60e3452ea4d16fb9c7416319

Fix crash reading ParticleEdit.is_editable

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b2e49be..8561903 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5364,6 +5364,8 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 		
 		sce->toolsettings->imapaint.paintcursor = NULL;
 		sce->toolsettings->particle.paintcursor = NULL;
+		sce->toolsettings->particle.scene = NULL;
+		sce->toolsettings->particle.object = NULL;
 
 		/* in rare cases this is needed, see [#33806] */
 		if (sce->toolsettings->vpaint) {




More information about the Bf-blender-cvs mailing list