[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21607] branches/blender2.5/blender/source /blender: 2.5: Defaults

Brecht Van Lommel brecht at blender.org
Thu Jul 16 00:58:12 CEST 2009


Revision: 21607
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21607
Author:   blendix
Date:     2009-07-16 00:58:12 +0200 (Thu, 16 Jul 2009)

Log Message:
-----------
2.5: Defaults

* 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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_style.c
    branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -105,6 +105,7 @@
 	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;
 }

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -5069,7 +5069,7 @@
 	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;

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -3077,7 +3077,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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;

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_style.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_style.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -92,7 +92,7 @@
 	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;

Modified: branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -854,14 +854,14 @@
 
 	/* 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! */

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c	2009-07-15 22:51:47 UTC (rev 21606)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c	2009-07-15 22:58:12 UTC (rev 21607)
@@ -733,7 +733,7 @@
 
 	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");
 





More information about the Bf-blender-cvs mailing list