[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26890] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix #20400: hair particles do not render when in "particle mode"

Brecht Van Lommel brecht at blender.org
Sun Feb 14 16:11:39 CET 2010


Revision: 26890
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26890
Author:   blendix
Date:     2010-02-14 16:11:39 +0100 (Sun, 14 Feb 2010)

Log Message:
-----------
Fix #20400: hair particles do not render when in "particle mode"
if children present.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2010-02-14 14:37:26 UTC (rev 26889)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2010-02-14 15:11:39 UTC (rev 26890)
@@ -60,6 +60,7 @@
 #include "BLI_threads.h"
 
 #include "BKE_anim.h"
+#include "BKE_animsys.h"
 
 #include "BKE_boids.h"
 #include "BKE_cloth.h"
@@ -254,7 +255,7 @@
 }
 int psys_in_edit_mode(Scene *scene, ParticleSystem *psys)
 {
-	return (scene->basact && (scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && (psys->edit || psys->pointcache->edit));
+	return (scene->basact && (scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && (psys->edit || psys->pointcache->edit) && !psys->renderdata);
 }
 static void psys_create_frand(ParticleSystem *psys)
 {
@@ -370,6 +371,7 @@
 /************************************************/
 void psys_free_settings(ParticleSettings *part)
 {
+	BKE_free_animdata(&part->id);
 	free_partdeflect(part->pd);
 	free_partdeflect(part->pd2);
 





More information about the Bf-blender-cvs mailing list