[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28467] branches/render25/source/blender/ editors/physics/particle_edit.c: last merge broke
Campbell Barton
ideasman42 at gmail.com
Tue Apr 27 19:19:09 CEST 2010
Revision: 28467
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28467
Author: campbellbarton
Date: 2010-04-27 19:19:09 +0200 (Tue, 27 Apr 2010)
Log Message:
-----------
last merge broke
Modified Paths:
--------------
branches/render25/source/blender/editors/physics/particle_edit.c
Modified: branches/render25/source/blender/editors/physics/particle_edit.c
===================================================================
--- branches/render25/source/blender/editors/physics/particle_edit.c 2010-04-27 15:56:06 UTC (rev 28466)
+++ branches/render25/source/blender/editors/physics/particle_edit.c 2010-04-27 17:19:09 UTC (rev 28467)
@@ -2376,9 +2376,8 @@
HairKey *hkey;
float weight;
ParticleBrushData *brush= &pset->brush[pset->brushtype];
+
float factor= RNA_float_get(op->ptr, "factor");
-
- float factor= RNA_float_get(op->ptr, "factor");
weight= brush->strength;
edit= psys->edit;
More information about the Bf-blender-cvs
mailing list