[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24376] trunk/blender: - removing the last particle system now exits particle edit mode.

[Campbell Barton]

Revision: 24376
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24376
Author:   campbellbarton
Date:     2009-11-06 13:27:28 +0100 (Fri, 06 Nov 2009)

Log Message:
-----------
- removing the last particle system now exits particle edit mode.
- py UI script used an undeclared variable

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d_toolbar.py
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/editors/physics/particle_object.c

Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2009-11-06 11:09:04 UTC (rev 24375)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2009-11-06 12:27:28 UTC (rev 24376)
@@ -830,6 +830,8 @@
 
         layout.itemR(pe, "type", text="")
 
+        ptcache = None
+
         if pe.type == 'PARTICLES':
             if ob.particle_systems:
                 if len(ob.particle_systems) > 1:

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2009-11-06 11:09:04 UTC (rev 24375)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2009-11-06 12:27:28 UTC (rev 24376)
@@ -2276,7 +2276,7 @@
 /*	Object *ob= ctx->sim.ob; */
 	ParticleSystem *psys= ctx->sim.psys;
 	ParticleSettings *part = psys->part;
-	ParticleEditSettings *pset = &scene->toolsettings->particle;
+/*	ParticleEditSettings *pset = &scene->toolsettings->particle; */
 	int totparent=0, between=0;
 	int steps = (int)pow(2.0, (double)part->draw_step);
 	int totchild = psys->totchild;
@@ -3334,6 +3334,8 @@
 
 	if(ob->particlesystem.first)
 		((ParticleSystem *) ob->particlesystem.first)->flag |= PSYS_CURRENT;
+	else
+		ob->mode &= ~OB_MODE_PARTICLE_EDIT;
 
 	DAG_scene_sort(scene);
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);

Modified: trunk/blender/source/blender/editors/physics/particle_object.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_object.c	2009-11-06 11:09:04 UTC (rev 24375)
+++ trunk/blender/source/blender/editors/physics/particle_object.c	2009-11-06 12:27:28 UTC (rev 24376)
@@ -93,11 +93,20 @@
 {
 	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
 	Scene *scene = CTX_data_scene(C);
-
+	int mode_orig = ob->mode;
 	if(!scene || !ob)
 		return OPERATOR_CANCELLED;
 
 	object_remove_particle_system(scene, ob);
+
+	/* possible this isn't the active object
+	 * object_remove_particle_system() clears the mode on the last psys
+	 * */
+	if(mode_orig & OB_MODE_PARTICLE_EDIT)
+		if((ob->mode & OB_MODE_PARTICLE_EDIT)==0)
+			if(scene->basact && scene->basact->object==ob)
+				WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
+
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	
 	return OPERATOR_FINISHED;