archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for bug: [#14570] particle system: grid distribution + vertex emitting bug

Browse Source 
- grid distribution didn't check for emission from vertices
This commit is contained in:
Janne Karhu
2008-07-06 22:52:55 +00:00
parent a06a4663c4
commit dd5148e265
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/buttons_object.c
View File

@@ -4812,7 +4812,7 @@ static void object_panel_particle_system(Object *ob)
uiDefBut(block, LABEL, 0, "Basic:", butx,(buty-=buth),butw,buth, NULL, 0.0, 0, 0, 0, "");
uiBlockBeginAlign(block);
if(part->distr==PART_DISTR_GRID)
if(part->distr==PART_DISTR_GRID && part->from != PART_FROM_VERT)
uiDefButI(block, NUM, B_PART_ALLOC, "Resol:", butx,(buty-=buth),butw,buth, &part->grid_res, 1.0, 100.0, 0, 0, "The resolution of the particle grid");
else
uiDefButI(block, NUM, B_PART_ALLOC, "Amount:", butx,(buty-=buth),butw,buth, &part->totpart, 0.0, 100000.0, 0, 0, "The total number of particles");