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

[Brecht Van Lommel]

Revision: 14644
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14644
Author:   blendix
Date:     2008-05-01 19:31:01 +0200 (Thu, 01 May 2008)

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

Fix for bug #10144: "set editable" on a disabled particle system
could cause crashes.
Fix related to bug #10198: particle mode didn't respect undo steps
set to 0.

Also made the memory statistics print (ctrl+alt+shift+q) use the
more human readable form to give an overview, instead of printing
out a python script.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_object.c
    trunk/blender/source/blender/src/drawobject.c
    trunk/blender/source/blender/src/editscreen.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-05-01 16:00:59 UTC (rev 14643)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-05-01 17:31:01 UTC (rev 14644)
@@ -3130,9 +3130,13 @@
 				}
 			}
 			else {
-				psys->flag |= PSYS_EDITED;
-				if(G.f & G_PARTICLEEDIT)
-					PE_create_particle_edit(ob, psys);
+				if(psys_check_enabled(ob, psys)) {
+					psys->flag |= PSYS_EDITED;
+					if(G.f & G_PARTICLEEDIT)
+						PE_create_particle_edit(ob, psys);
+				}
+				else
+					error("Particle system not enabled, skipping set editable");
 			}
 		}
 	case B_FIELD_DEP:

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2008-05-01 16:00:59 UTC (rev 14643)
+++ trunk/blender/source/blender/src/drawobject.c	2008-05-01 17:31:01 UTC (rev 14644)
@@ -3474,6 +3474,8 @@
 		PE_hide_keys_time(psys,CFRA);
 		psys_cache_paths(ob,psys,CFRA,0);
 	}
+	if(psys->pathcache==0)
+		return;
 
 	if(pset->flag & PE_SHOW_CHILD && psys->part->draw_as == PART_DRAW_PATH) {
 		if(psys->childcache==0)

Modified: trunk/blender/source/blender/src/editscreen.c
===================================================================
--- trunk/blender/source/blender/src/editscreen.c	2008-05-01 16:00:59 UTC (rev 14643)
+++ trunk/blender/source/blender/src/editscreen.c	2008-05-01 17:31:01 UTC (rev 14644)
@@ -1396,7 +1396,7 @@
 		else if (event==QKEY) {
 			/* Temp place to print mem debugging info ctrl+alt+shift + qkey */
 			if ( G.qual == (LR_SHIFTKEY | LR_ALTKEY | LR_CTRLKEY) ) {
-				MEM_printmemlist_pydict();
+				MEM_printmemlist_stats();
 			}
 			
 			else if((G.obedit && G.obedit->type==OB_FONT && g_activearea->spacetype==SPACE_VIEW3D)||g_activearea->spacetype==SPACE_TEXT||g_activearea->spacetype==SPACE_SCRIPT);

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-05-01 16:00:59 UTC (rev 14643)
+++ trunk/blender/source/blender/src/space.c	2008-05-01 17:31:01 UTC (rev 14644)
@@ -1005,6 +1005,8 @@
 			undo_push_armature(str);
 	}
 	else if(G.f & G_PARTICLEEDIT) {
+		if (U.undosteps == 0) return;
+
 		PE_undo_push(str);
 	}
 	else {