[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23534] trunk/blender/source/blender/ editors/transform: Fix #19468: particle mode crash in transform, when there are

[Brecht Van Lommel]

Revision: 23534
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23534
Author:   blendix
Date:     2009-09-28 16:51:42 +0200 (Mon, 28 Sep 2009)

Log Message:
-----------
Fix #19468: particle mode crash in transform, when there are
no editable particles.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2009-09-28 14:51:42 UTC (rev 23534)
@@ -4825,7 +4825,7 @@
 		//	allqueue(REDRAWBUTSEDIT, 0);
 
 	}
-	else if(t->scene->basact && (ob = t->scene->basact->object) && ob->mode & OB_MODE_PARTICLE_EDIT) {
+	else if(t->scene->basact && (ob = t->scene->basact->object) && (ob->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(t->scene, ob)) {
 		;
 	}
 	else {

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2009-09-28 14:51:42 UTC (rev 23534)
@@ -92,6 +92,7 @@
 #include "ED_markers.h"
 #include "ED_mesh.h"
 #include "ED_retopo.h"
+#include "ED_particle.h"
 #include "ED_screen_types.h"
 #include "ED_space_api.h"
 #include "ED_uvedit.h"
@@ -346,7 +347,7 @@
 
 	if (t->obedit) {
 	}
-	else if(base && base->object->mode & OB_MODE_PARTICLE_EDIT) {
+	else if(base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(scene, base->object)) {
 		flushTransParticles(t);
 	}
 	if (t->spacetype==SPACE_NODE) {