Commit: fdc3da9646683cdffbbe242c6c90e688c4d1e591
Author: Martin Felke
Date:   Fri Aug 10 11:41:19 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rBfdc3da9646683cdffbbe242c6c90e688c4d1e591

do not init copy any more (was incorrect behavior)

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

M       release/datafiles/locale
M       release/scripts/addons
M       release/scripts/addons_contrib
M       source/blender/modifiers/intern/MOD_fracture.c
M       source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 59495b4b590..d3349b42856 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 59495b4b59077aa1cc68fffbdae1463af980f08e
+Subproject commit d3349b42856d00c278f72f2a5909a6c96b9cdb5e
diff --git a/release/scripts/addons b/release/scripts/addons
index 1a5f14657ee..9ca218bf425 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1a5f14657ee06ec2f520326032305dc1f2c5e2d5
+Subproject commit 9ca218bf4252869dda11b44029cdebfcbff9aad1
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index b4496a81e4f..15b25a42783 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit b4496a81e4f3d607a692f7c2e12fce3dbd784de4
+Subproject commit 15b25a42783d1e516b5298d70b582fae2559ae17
diff --git a/source/blender/modifiers/intern/MOD_fracture.c 
b/source/blender/modifiers/intern/MOD_fracture.c
index 8d28f6407f1..bca4cd5ee74 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -163,8 +163,8 @@ static void initData(ModifierData *md)
 
        if (!fmd->shared) {
                fmd->shared = MEM_callocN(sizeof(FractureModifierData_Shared), 
"FractureModifierData_Shared");
-               fmd->shared->refresh = true;
-               fmd->shared->reset_shards = true;
+               //fmd->shared->refresh = true;
+               //fmd->shared->reset_shards = true;
        }
 }
 
@@ -188,14 +188,16 @@ static void copyData(ModifierData *md, ModifierData 
*target, const int flag)
 {
        FractureModifierData *trmd = (FractureModifierData *)target;
 
+       modifier_copyData_generic(md, target, flag);
+
        if ((flag & LIB_ID_CREATE_NO_MAIN) == 0) {
                /* This is a regular copy, and not a CoW copy for depsgraph 
evaluation */
                trmd->shared = MEM_callocN(sizeof(FractureModifierData_Shared), 
"FractureModifierData_Shared");
-               trmd->shared->refresh = true;
-               trmd->shared->reset_shards = true;
-       }
 
-       modifier_copyData_generic(md, target, flag);
+               /* this behaves oddly somehow incorrectly, as if it was an 
array modifier -> duplicates sim behavior */
+               //trmd->shared->refresh = true;
+               //trmd->shared->reset_shards = true;
+       }
 }
 
 static bool dependsOnTime(ModifierData *UNUSED(md))
diff --git a/source/tools b/source/tools
index 11656ebaf7f..8ebcf630fcd 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa
+Subproject commit 8ebcf630fcd0131674d69cbf3ae30101bc3c8b62

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

Reply via email to