Fix for: [#18499] Particle size can only be set in steps of 0.1

- Some button settings were wrong.

diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 7fc504ba8d3fefccb2e258ee9059daab01434002..7161bc8c26615b986d76bffb3bb24f0bb3e18302 100644 (file)
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4428,11 +4428,11 @@ static void object_panel_particle_extra(Object *ob)
                buty-=buth;
 
        /* size changes must create a recalc event always so that sizes are updated properly */
                buty-=buth;
 
        /* size changes must create a recalc event always so that sizes are updated properly */

-       uiDefButF(block, NUM, B_PART_RECALC, "Size:",   butx,(buty-=buth),butw,buth, &part->size, 0.01, 100, 10, 1, "The size of the particles");
-       uiDefButF(block, NUM, B_PART_RECALC, "Rand:",   butx,(buty-=buth),butw,buth, &part->randsize, 0.0, 1.0, 10, 1, "Give the particle size a random variation");
+       uiDefButF(block, NUM, B_PART_RECALC, "Size:",   butx,(buty-=buth),butw,buth, &part->size, 0.001, 100, 10, 0, "The size of the particles");
+       uiDefButF(block, NUM, B_PART_RECALC, "Rand:",   butx,(buty-=buth),butw,buth, &part->randsize, 0.0, 1.0, 10, 0, "Give the particle size a random variation");

 
        uiDefButBitI(block, TOG, PART_SIZEMASS, B_PART_RECALC, "Mass from size",         butx,(buty-=buth),butw,buth, &part->flag, 0, 0, 0, 0, "Multiply mass with particle size");
 
        uiDefButBitI(block, TOG, PART_SIZEMASS, B_PART_RECALC, "Mass from size",         butx,(buty-=buth),butw,buth, &part->flag, 0, 0, 0, 0, "Multiply mass with particle size");

-       uiDefButF(block, NUM, B_PART_RECALC, "Mass:",   butx,(buty-=buth),butw,buth, &part->mass, 0.01, 100, 10, 1, "Specify the mass of the particles");
+       uiDefButF(block, NUM, B_PART_RECALC, "Mass:",   butx,(buty-=buth),butw,buth, &part->mass, 0.001, 100, 10, 0, "Specify the mass of the particles");

 }
 /* copy from buttons_shading.c */
 static void autocomplete_uv(char *str, void *arg_v)
 }
 /* copy from buttons_shading.c */
 static void autocomplete_uv(char *str, void *arg_v)


@@ -4936,8 +4936,8 @@ static void object_panel_particle_system(Object *ob)
        }
 
        if(part->type!=PART_HAIR) {
        }
 
        if(part->type!=PART_HAIR) {

-               uiDefButF(block, NUM, B_PART_INIT, "Life:",     butx,(buty-=buth),butw,buth, &part->lifetime, 1.0, MAXFRAMEF, 100, 1, "Specify the life span of the particles");
-               uiDefButF(block, NUM, B_PART_INIT, "Rand:",     butx,(buty-=buth),butw,buth, &part->randlife, 0.0, 1.0, 10, 1, "Give the particle life a random variation");
+               uiDefButF(block, NUM, B_PART_INIT, "Life:",     butx,(buty-=buth),butw,buth, &part->lifetime, 1.0, MAXFRAMEF, 100, 0, "Specify the life span of the particles");
+               uiDefButF(block, NUM, B_PART_INIT, "Rand:",     butx,(buty-=buth),butw,buth, &part->randlife, 0.0, 1.0, 10, 0, "Give the particle life a random variation");

        }
 
        uiBlockEndAlign(block);
        }
 
        uiBlockEndAlign(block);