[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13853] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13853
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13853
Author:   blendix
Date:     2008-02-24 22:29:20 +0100 (Sun, 24 Feb 2008)

Log Message:
-----------

Fix for bug #8353: switching particle hair with softbody to emit crashed.
Fix for bug #8355: crash zooming in render window.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/src/renderwin.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2008-02-24 21:24:39 UTC (rev 13852)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2008-02-24 21:29:20 UTC (rev 13853)
@@ -287,6 +287,11 @@
 	}
 
 	psys->flag &= ~PSYS_HAIR_DONE;
+
+	if(psys->soft) {
+		sbFree(psys->soft);
+		psys->soft = NULL;
+	}
 }
 void free_keyed_keys(ParticleSystem *psys)
 {
@@ -363,11 +368,6 @@
 			psys->part=0;
 		}
 
-		if(psys->soft){
-			sbFree(psys->soft);
-			psys->soft = 0;
-		}
-
 		MEM_freeN(psys);
 	}
 }

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-24 21:24:39 UTC (rev 13852)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-24 21:29:20 UTC (rev 13853)
@@ -4444,6 +4444,7 @@
 		else
 			free_hair(psys);
 
+		psys->softflag= 0;
 		psys->recalc &= ~PSYS_TYPE;
 		alloc = 1;
 

Modified: trunk/blender/source/blender/src/renderwin.c
===================================================================
--- trunk/blender/source/blender/src/renderwin.c	2008-02-24 21:24:39 UTC (rev 13852)
+++ trunk/blender/source/blender/src/renderwin.c	2008-02-24 21:29:20 UTC (rev 13853)
@@ -346,7 +346,7 @@
 		RenderResult rres;
 		RenderSpare *rspare= render_spare;
 		
-		if(rspare->showspare) {
+		if(rspare && rspare->showspare) {
 			if(rspare->ibuf) {
 				rres.rectx= rspare->ibuf->x;
 				rres.recty= rspare->ibuf->y;