fix for bug #2588

objects with circular dependancies where not handled correctly
when sorting bases.

the fix is actually a workaround only and may evolve later

also add changes to xcode project for recent commits

1 files changed, 8 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 7ae3f39e197..668b18c0913 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -999,6 +999,14 @@ void topo_sort_baselist(struct Scene *sce){
 		}
 	}
 	
+	// temporal correction for circular dependancies
+	base = sce->base.first;
+	while (base) {
+		BLI_remlink(&sce->base,base);
+		BLI_addhead(&tempbase,base);
+		base = sce->base.first;
+	}
+	
 	sce->base = tempbase;
 	queue_delete(nqueue);
 }