[Bf-blender-cvs] [40f3759] fracture_modifier: dynamic fracture: disabled loading / saving of dynamic mode again, it still has too many issues

Martin Felke noreply at git.blender.org
Fri Jun 5 09:21:58 CEST 2015


Commit: 40f375948240935f21eb1f8cdaf95124fba0d7b2
Author: Martin Felke
Date:   Thu Jun 4 20:34:17 2015 +0200
Branches: fracture_modifier
https://developer.blender.org/rB40f375948240935f21eb1f8cdaf95124fba0d7b2

dynamic fracture: disabled loading / saving of dynamic mode again, it still has too many issues

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

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 7f14340..47378cc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4858,6 +4858,10 @@ 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->shard_sequence.first = NULL;
+		fmd->shard_sequence.last = NULL;
+		fmd->meshIsland_sequence.first = NULL;
+		fmd->meshIsland_sequence.last = NULL;
 	}
 
 	if (fm == NULL || fmd->dm_group) {
@@ -4938,6 +4942,7 @@ static void load_fracture_modifier(FileData* fd, FractureModifierData *fmd, Obje
 				vertstart += initialize_meshisland(fmd, &mi, mverts, vertstart, ob, -1, -1);
 			}
 		}
+#if 0
 		else if (fmd->fracture_mode == MOD_FRACTURE_DYNAMIC)
 		{
 			ShardSequence *ssq = NULL;
@@ -5006,6 +5011,7 @@ static void load_fracture_modifier(FileData* fd, FractureModifierData *fmd, Obje
 				fmd->current_mi_entry = msq;
 			}
 		}
+#endif
 
 		fmd->refresh_constraints = true;
 		fmd->meshConstraints.first = NULL;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index efdcc7e..4b062a0 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1696,6 +1696,7 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 					}
 				}
 			}
+#if 0
 			else if (fmd->fracture_mode == MOD_FRACTURE_DYNAMIC)
 			{
 				ShardSequence *ssq;
@@ -1718,6 +1719,7 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 					}
 				}
 			}
+#endif
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list