Revision: 48577
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48577
Author: nazgul
Date: 2012-07-04 07:37:21 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Merging r48575 through r48576 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48575
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48576
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48574
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48576
Modified:
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
2012-07-04 07:35:54 UTC (rev 48576)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
2012-07-04 07:37:21 UTC (rev 48577)
@@ -3323,7 +3323,7 @@
/* stickiness was possibly added before, so cancel that before
calculating new normal velocity */
/* otherwise particles go flying out of the surface because of
high reversed sticky velocity */
if (v0_dot < 0.0f) {
- v0_dot += pd->pdef_stickiness;
+ v0_dot += pd->pdef_stickness;
if (v0_dot > 0.0f)
v0_dot = 0.0f;
}
@@ -3380,7 +3380,7 @@
}
/* add stickiness to surface */
- madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickiness);
+ madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickness);
/* set coordinates for next iteration */
copy_v3_v3(col->co1, co);
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48574
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48576
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48574
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48576
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
2012-07-04 07:35:54 UTC (rev 48576)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
2012-07-04 07:37:21 UTC (rev 48577)
@@ -89,7 +89,7 @@
float pdef_perm; /* Chance of particle passing through mesh
*/
float pdef_frict; /* Friction factor for particle deflection
*/
float pdef_rfrict; /* Random element of friction for deflection
*/
- float pdef_stickiness;/* surface particle stickiness
*/
+ float pdef_stickness;/* surface particle stickiness
*/
float absorption; /* used for forces */
Modified:
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
2012-07-04 07:35:54 UTC (rev 48576)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
2012-07-04 07:37:21 UTC (rev 48577)
@@ -902,7 +902,7 @@
RNA_def_property_update(prop, 0, "rna_CollisionSettings_update");
prop = RNA_def_property(srna, "stickiness", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "pdef_stickiness");
+ RNA_def_property_float_sdna(prop, NULL, "pdef_stickness");
RNA_def_property_range(prop, 0.0f, 10.0f);
RNA_def_property_ui_text(prop, "Stickiness", "Amount of stickiness to
surface collision");
RNA_def_property_update(prop, 0, "rna_CollisionSettings_update");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
