[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25301] trunk/blender/source/blender: For for [#20330] Can't open a file made in 2.49
Matt Ebb
matt at mke3.net
Fri Dec 11 01:09:58 CET 2009
Revision: 25301
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25301
Author: broken
Date: 2009-12-11 01:09:58 +0100 (Fri, 11 Dec 2009)
Log Message:
-----------
For for [#20330] Can't open a file made in 2.49
Hair clothsim internal_friction wasn't being initialised correctly.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-12-10 23:24:31 UTC (rev 25300)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-12-11 00:09:58 UTC (rev 25301)
@@ -154,6 +154,7 @@
clmd->sim_parms->defgoal = 0.0f;
clmd->sim_parms->goalspring = 1.0f;
clmd->sim_parms->goalfrict = 0.0f;
+ clmd->sim_parms->velocity_smooth = 0.0f;
if(!clmd->sim_parms->effector_weights)
clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-12-10 23:24:31 UTC (rev 25300)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-12-11 00:09:58 UTC (rev 25301)
@@ -10184,6 +10184,21 @@
sce->toolsettings->particle.selectmode= SCE_SELECT_PATH;
}
+ {
+ Object *ob;
+
+ /* properly initialise hair clothsim data on old files */
+ for(ob = main->object.first; ob; ob = ob->id.next) {
+ ModifierData *md;
+ for(md= ob->modifiers.first; md; md= md->next) {
+ if (md->type == eModifierType_Cloth) {
+ ClothModifierData *clmd = (ClothModifierData *)md;
+ if (clmd->sim_parms->velocity_smooth < 0.01f)
+ clmd->sim_parms->velocity_smooth = 0.f;
+ }
+ }
+ }
+ }
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
More information about the Bf-blender-cvs
mailing list