[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37319] trunk/blender/source/blender: fix for own error r35918, generalizing looping over modifier ID links
Campbell Barton
ideasman42 at gmail.com
Wed Jun 8 18:00:53 CEST 2011
Revision: 37319
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37319
Author: campbellbarton
Date: 2011-06-08 16:00:52 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
fix for own error r35918, generalizing looping over modifier ID links
broke loading smoke group references because they already had calls to
newlibadr_us() elsewhere, removing those assignments fixes loading.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35918
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-06-08 15:17:38 UTC (rev 37318)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-06-08 16:00:52 UTC (rev 37319)
@@ -3843,12 +3843,6 @@
if(smd && smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain)
{
- smd->domain->coll_group = newlibadr_us(fd, ob->id.lib, smd->domain->coll_group);
- smd->domain->eff_group = newlibadr_us(fd, ob->id.lib, smd->domain->eff_group);
- smd->domain->fluid_group = newlibadr_us(fd, ob->id.lib, smd->domain->fluid_group);
-
- smd->domain->effector_weights->group = newlibadr(fd, ob->id.lib, smd->domain->effector_weights->group);
-
smd->domain->flags |= MOD_SMOKE_FILE_LOAD; /* flag for refreshing the simulation after loading */
}
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2011-06-08 15:17:38 UTC (rev 37318)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2011-06-08 16:00:52 UTC (rev 37319)
@@ -43,6 +43,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_smoke_types.h"
+#include "DNA_object_force.h"
#include "BLI_utildefines.h"
@@ -156,6 +157,10 @@
walk(userData, ob, (ID **)&smd->domain->coll_group);
walk(userData, ob, (ID **)&smd->domain->fluid_group);
walk(userData, ob, (ID **)&smd->domain->eff_group);
+
+ if(smd->domain->effector_weights) {
+ walk(userData, ob, (ID **)&smd->domain->effector_weights->group);
+ }
}
}
More information about the Bf-blender-cvs
mailing list