[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28457] trunk/blender/source/blender/ editors/physics/particle_edit.c: factor for setting particle weights

Campbell Barton ideasman42 at gmail.com
Tue Apr 27 11:54:36 CEST 2010


Revision: 28457
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28457
Author:   campbellbarton
Date:     2010-04-27 11:54:36 +0200 (Tue, 27 Apr 2010)

Log Message:
-----------
factor for setting particle weights

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/particle_edit.c

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2010-04-27 09:07:26 UTC (rev 28456)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2010-04-27 09:54:36 UTC (rev 28457)
@@ -2377,6 +2377,8 @@
 	float weight;
 	ParticleBrushData *brush= &pset->brush[pset->brushtype];
 	edit= psys->edit;
+    
+    float factor= RNA_float_get(op->ptr, "factor");
 
 	weight= brush->strength;
 
@@ -2385,7 +2387,7 @@
 
 		LOOP_SELECTED_KEYS {
 			hkey= pa->hair + k;
-			hkey->weight= weight;
+			hkey->weight= interpf(weight, hkey->weight, factor);
 		}
 	}
 
@@ -2407,6 +2409,8 @@
 
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+    
+    RNA_def_float(ot->srna, "factor", 1, 0, 1, "Factor", "", 0, 1);
 }
 
 /************************ cursor drawing *******************************/





More information about the Bf-blender-cvs mailing list