2.5: Defaults
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 15 Jul 2009 22:58:12 +0000 (22:58 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 15 Jul 2009 22:58:12 +0000 (22:58 +0000)
* Wave modifier speed 0.5 -> 0.25.

* Particles even and random distribution on.
* Particles normal velocity 0.0 -> 1.0.
* Particles size 1.0 -> 0.05.
* Particles draw emitter and material color on.

* Field strength 0.0 -> 1.0

* Object drawing without material was not consistent
  with default material.

* Panel title 13 -> 12 points.

source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle.c
source/blender/editors/interface/interface_style.c
source/blender/gpu/intern/gpu_draw.c
source/blender/makesrna/intern/rna_modifier.c

index 553fdfe530e3375afe0e8e964c5d1c7f16097c4e..7951fcf1d3e18adfd36ecec6c4c994ab5ce7fb05 100644 (file)
@@ -105,6 +105,7 @@ PartDeflect *object_add_collision_fields(void)
        pd->pdef_sbift  = 0.2f;
        pd->pdef_sboft  = 0.02f;
        pd->seed = ((unsigned int)(ceil(PIL_check_seconds_timer()))+1) % 128;
+       pd->f_strength = 1.0f;
 
        return pd;
 }
index 046dfcc9f87d847077556b6953396674be73197d..948d02f2a80fcd1a571a26cc68cd92319753f1f7 100644 (file)
@@ -5069,7 +5069,7 @@ static void waveModifier_initData(ModifierData *md)
        wmd->map_object = NULL;
        wmd->height= 0.5f;
        wmd->width= 1.5f;
-       wmd->speed= 0.5f;
+       wmd->speed= 0.25f;
        wmd->narrow= 1.5f;
        wmd->lifetime= 0.0f;
        wmd->damp= 10.0f;
index cefeafcdd5038617b7aa760d0f6d659962b2cfcd..da14ac465504b76b86bfa680e5c1a61e06d9bc6c 100644 (file)
@@ -3077,7 +3077,7 @@ static void default_particle_settings(ParticleSettings *part)
        part->bb_uv_split=1;
        part->bb_align=PART_BB_VIEW;
        part->bb_split_offset=PART_BB_OFF_LINEAR;
-       part->flag=PART_REACT_MULTIPLE|PART_HAIR_GEOMETRY;
+       part->flag=PART_REACT_MULTIPLE|PART_HAIR_GEOMETRY|PART_EDISTR|PART_TRAND;
 
        part->sta= 1.0;
        part->end= 100.0;
@@ -3102,6 +3102,7 @@ static void default_particle_settings(ParticleSettings *part)
        part->nbetween= 4;
        part->boidneighbours= 5;
 
+       part->normfac= 1.0f;
        part->max_vel = 10.0f;
        part->average_vel = 0.3f;
        part->max_tan_acc = 0.2f;
@@ -3110,7 +3111,7 @@ static void default_particle_settings(ParticleSettings *part)
        part->reactshape=1.0f;
 
        part->mass=1.0;
-       part->size=1.0;
+       part->size=0.05;
        part->childsize=1.0;
 
        part->child_nbr=10;
@@ -3128,6 +3129,7 @@ static void default_particle_settings(ParticleSettings *part)
        part->clength=1.0f;
        part->clength_thres=0.0f;
 
+       part->draw= PART_DRAW_EMITTER|PART_DRAW_MAT_COL;
        part->draw_line[0]=0.5;
        part->path_start = 0.0f;
        part->path_end = 1.0f;
index 57f35f719276f96b650a23cf65f1b09cbebb6ad5..6faa658c3d0d4328776db9eee6faced1f00079cb 100644 (file)
@@ -92,7 +92,7 @@ static uiStyle *ui_style_new(ListBase *styles, const char *name)
        style->panelzoom= 1.0;
 
        style->paneltitle.uifont_id= UIFONT_DEFAULT;
-       style->paneltitle.points= 13;
+       style->paneltitle.points= 12;
        style->paneltitle.kerning= 0;
        style->paneltitle.shadow= 5;
        style->paneltitle.shadx= 2;
index efb7d688a490c1c3a06d6b988a3d4829b04086f0..1031a240470b162840f404805c25389d86ae4ecf 100644 (file)
@@ -854,14 +854,14 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O
 
        /* no materials assigned? */
        if(ob->totcol==0) {
-               GMS.matbuf[0][0][0]= defmaterial.r;
-               GMS.matbuf[0][0][1]= defmaterial.g;
-               GMS.matbuf[0][0][2]= defmaterial.b;
+               GMS.matbuf[0][0][0]= (defmaterial.ref+defmaterial.emit)*defmaterial.r;
+               GMS.matbuf[0][0][1]= (defmaterial.ref+defmaterial.emit)*defmaterial.g;
+               GMS.matbuf[0][0][2]= (defmaterial.ref+defmaterial.emit)*defmaterial.b;
                GMS.matbuf[0][0][3]= 1.0;
 
-               GMS.matbuf[0][1][0]= defmaterial.specr;
-               GMS.matbuf[0][1][1]= defmaterial.specg;
-               GMS.matbuf[0][1][2]= defmaterial.specb;
+               GMS.matbuf[0][1][0]= defmaterial.spec*defmaterial.specr;
+               GMS.matbuf[0][1][1]= defmaterial.spec*defmaterial.specg;
+               GMS.matbuf[0][1][2]= defmaterial.spec*defmaterial.specb;
                GMS.matbuf[0][1][3]= 1.0;
                
                /* do material 1 too, for displists! */
index f207f4f605d0ccd62b83bb119a2ccbe35b1b529b..b3dfc6a8dd6aa4f0746a6eebfbdba35a77fff80a 100644 (file)
@@ -733,7 +733,7 @@ static void rna_def_modifier_wave(BlenderRNA *brna)
 
        prop= RNA_def_property(srna, "speed", PROP_FLOAT, PROP_NONE);
        RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
-       RNA_def_property_ui_range(prop, -2, 2, 10, 2);
+       RNA_def_property_ui_range(prop, -1, 1, 10, 2);
        RNA_def_property_ui_text(prop, "Speed", "");
        RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");