diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-12 09:02:47 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-12 09:02:47 +0400 |
| commit | 8398730043faeb9af860ca7a408a5a4ba49b46f1 (patch) | |
| tree | bc38242ec4333e81f5aea3205fffa21f669abffe /source/blender/src/buttons_object.c | |
| parent | d124d3c5cdfdc9d470a4734281396b97c4d3afb5 (diff) | |
soc-2008-mxcurioni: merge with trunk - rev 15540
Diffstat (limited to 'source/blender/src/buttons_object.c')
| -rw-r--r-- | source/blender/src/buttons_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index ba409723784..ebe770c89e7 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -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"); |