[Bf-blender-cvs] [90d6041] fracture_modifier: for now, deactivate loading for dynamic files again, there are still issues to solve (like proper cache handling after loading)

[Martin Felke]

Commit: 90d6041f4e9a410969e8edcf29105269d5b185e6
Author: Martin Felke
Date:   Wed Jun 3 11:25:46 2015 +0200
Branches: fracture_modifier
https://developer.blender.org/rB90d6041f4e9a410969e8edcf29105269d5b185e6

for now, deactivate loading for dynamic files again, there are still issues to 
solve (like proper cache handling after loading)

===================================================================

M       source/blender/blenloader/intern/readfile.c
M       source/blender/blenloader/intern/writefile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c 
b/source/blender/blenloader/intern/readfile.c
index 7682dfa..0d7466d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4857,7 +4857,7 @@ static void load_fracture_modifier(FileData* fd, 
FractureModifierData *fmd, Obje
 
        /*HARDCODING this for now, until we can version it properly, say with 
2.75 ? */
        if (fd->fileversion < 275) {
-               //fmd->fracture_mode = MOD_FRACTURE_PREFRACTURED;
+               fmd->fracture_mode = MOD_FRACTURE_PREFRACTURED;
        }
 
        if (fm == NULL || fmd->dm_group) {
@@ -4944,6 +4944,9 @@ static void load_fracture_modifier(FileData* fd, 
FractureModifierData *fmd, Obje
                        MeshIslandSequence *msq = NULL;
                        fmd->dm = NULL;
 
+                       fmd->lookup_mesh_state = newdataadr(fd, 
fmd->lookup_mesh_state);
+                       fmd->do_match_vertex_coords = newdataadr(fd, 
fmd->do_match_vertex_coords);
+
                        link_list(fd, &fmd->shard_sequence);
                        for (ssq = fmd->shard_sequence.first; ssq; ssq = 
ssq->next)
                        {
diff --git a/source/blender/blenloader/intern/writefile.c 
b/source/blender/blenloader/intern/writefile.c
index ea0b03b..b8fbd6a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1700,6 +1700,10 @@ static void write_modifiers(WriteData *wd, ListBase 
*modbase)
                        {
                                ShardSequence *ssq;
                                MeshIslandSequence *msq;
+
+                               writedata(wd, DATA, 
sizeof(fmd->lookup_mesh_state), fmd->lookup_mesh_state);
+                               writedata(wd, DATA, 
sizeof(fmd->do_match_vertex_coords), fmd->do_match_vertex_coords);
+
                                for (ssq = fmd->shard_sequence.first; ssq; ssq 
= ssq->next)
                                {
                                        writestruct(wd, DATA, "ShardSequence", 
1, ssq);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs