Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Merge branch 'master' into eop

Ben Hambrecht374d131b4c88
diff --cc mobject/mobject.py
index c069caf18,4c5721f90..c9a2affab
--- a/mobject/mobject.py
+++ b/mobject/mobject.py
@@@ -743,7 -745,6 +745,10 @@@ class Mobject(Container)
def submobject_family(self):
sub_families = map(Mobject.submobject_family, self.submobjects)
all_mobjects = [self] + list(it.chain(*sub_families))
++<<<<<<< HEAD
+ #all_mobjects = list(it.chain(*sub_families)) + [self]
++=======
++>>>>>>> master
return remove_list_redundancies(all_mobjects)
def family_members_with_points(self):