[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25179] trunk/blender/source/blender/ editors: Particles: bugfixes

Brecht Van Lommel brecht at blender.org
Mon Dec 7 19:17:39 CET 2009


Revision: 25179
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25179
Author:   blendix
Date:     2009-12-07 19:17:39 +0100 (Mon, 07 Dec 2009)

Log Message:
-----------
Particles: bugfixes

* Don't show Apply as Shape for particle modifiers.
* Fix particles disappearing after exiting particle mode.
* Fix free edit not redrawing the 3d view.
* Fix use of uninitialized variable in layers template.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/physics/particle_edit.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2009-12-07 18:10:11 UTC (rev 25178)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2009-12-07 18:17:39 UTC (rev 25179)
@@ -715,13 +715,13 @@
 					if(ELEM3(psys->part->ren_as, PART_DRAW_PATH, PART_DRAW_GR, PART_DRAW_OB) && psys->pathcache)
 						uiItemO(row, "Convert", 0, "OBJECT_OT_modifier_convert");
 			}
-			else 
+			else {
 				uiItemEnumO(row, "Apply", 0, "OBJECT_OT_modifier_apply", "apply_as", MODIFIER_APPLY_DATA);
+				
+				if (modifier_sameTopology(md))
+					uiItemEnumO(row, "Apply as Shape", 0, "OBJECT_OT_modifier_apply", "apply_as", MODIFIER_APPLY_SHAPE);
+			}
 			
-			if (modifier_sameTopology(md))
-				uiItemEnumO(row, "Apply as Shape", 0, "OBJECT_OT_modifier_apply", "apply_as", MODIFIER_APPLY_SHAPE);
-			
-			
 			uiBlockClearButLock(block);
 			uiBlockSetButLock(block, ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
 
@@ -1951,7 +1951,7 @@
 		      PointerRNA *used_ptr, char *used_propname, int active_layer)
 {
 	uiLayout *uRow, *uCol;
-	PropertyRNA *prop, *used_prop;
+	PropertyRNA *prop, *used_prop= NULL;
 	int groups, cols, layers;
 	int group, col, layer, row;
 	int cols_per_group = 5;

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2009-12-07 18:10:11 UTC (rev 25178)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2009-12-07 18:17:39 UTC (rev 25179)
@@ -4024,6 +4024,7 @@
 			psys->flag &= ~PSYS_EDITED;
 
 			psys_reset(psys, PSYS_RESET_DEPSGRAPH);
+			WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 		}
 	}

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2009-12-07 18:10:11 UTC (rev 25178)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2009-12-07 18:17:39 UTC (rev 25179)
@@ -5920,8 +5920,9 @@
 
 		for(psys=ob->particlesystem.first; psys; psys=psys->next) {
 			/* run this so that possible child particles get cached */
-			if(edit && edit->psys == psys)
-				draw_update_ptcache_edit(scene, ob, edit);
+			if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT)
+				if(edit && edit->psys == psys)
+					draw_update_ptcache_edit(scene, ob, edit);
 
 			draw_new_particle_system(scene, v3d, rv3d, base, psys, dt);
 		}





More information about the Bf-blender-cvs mailing list