[Bf-blender-cvs] [bd1e6e00a6d] temp-fracture-modifier-2.8: small fix for extra particle/ extra vert group, submodule pointer correction

Martin Felke noreply at git.blender.org
Fri Aug 24 23:35:37 CEST 2018


Commit: bd1e6e00a6dde94595691ee8793964d13e8108cf
Author: Martin Felke
Date:   Fri Aug 24 23:19:19 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rBbd1e6e00a6dde94595691ee8793964d13e8108cf

small fix for extra particle/ extra vert group, submodule pointer correction

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	release/scripts/startup/bl_ui/properties_physics_fracture.py
M	source/blender/blenkernel/intern/fracture.c

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 9ae033c49c1..5e741506342 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 9ae033c49c1b16718eac6306bdc271a5e6e6bf38
+Subproject commit 5e7415063426f8c03ef53edc2b412f6572798765
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f178e6c933a..b4496a81e4f 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f178e6c933a25c621a5cc7d92935b66cd2ec2f5d
+Subproject commit b4496a81e4f3d607a692f7c2e12fce3dbd784de4
diff --git a/release/scripts/startup/bl_ui/properties_physics_fracture.py b/release/scripts/startup/bl_ui/properties_physics_fracture.py
index e8d051b029f..686d1cd55a4 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fracture.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fracture.py
@@ -85,7 +85,7 @@ class PHYSICS_PT_fracture_advanced(PhysicButtonsPanel, Panel):
         #    col.prop(md, "grease_offset")
         #    col.prop(md, "grease_decimate")
         #    col.prop(md, "cutter_axis")
-        if {'EXTRA_PARTICLES', 'EXTRA_VERTICES'} in md.point_source:
+        if 'EXTRA_PARTICLES' in md.point_source or 'EXTRA_VERTS' in md.point_source:
             col.prop(md, "extra_group", text="Helpers")
         if 'CUSTOM' in md.point_source:
             col.prop(md, "cutter_group")
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 9569b3a3bfd..53cf585bb47 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -1959,15 +1959,15 @@ void BKE_fracture_modifier_free(FractureModifierData *fmd, Scene *scene)
 static int getGroupObjects(Collection *gr, Object ***obs, int g_exist)
 {
 	int ctr = g_exist;
-	CollectionObject *go;
 	if (gr == NULL) return ctr;
 
-	for (go = gr->gobject.first; go; go = go->next) {
-
+	FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(gr, ob)
+	{
 		*obs = MEM_reallocN(*obs, sizeof(Object *) * (ctr + 1));
-		(*obs)[ctr] = go->ob;
+		(*obs)[ctr] = ob;
 		ctr++;
 	}
+	FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
 
 	return ctr;
 }



More information about the Bf-blender-cvs mailing list