From 0a89a775a2beb63147a49fdf93177e09bbaa7e7e Mon Sep 17 00:00:00 2001
From: Grant Sanderson <grant@3blue1brown.com>
Date: Wed, 17 Jun 2020 17:12:48 -0700
Subject: [PATCH] Clean up some family matters

---
 manimlib/mobject/mobject.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py
index d90579fc..1c9bbabe 100644
--- a/manimlib/mobject/mobject.py
+++ b/manimlib/mobject/mobject.py
@@ -462,31 +462,27 @@ class Mobject(Container):
         return self.scale(scale_factor, about_point=point)
 
     def fix_in_frame(self, family=True):
-        self.is_fixed_in_frame = True
-        if family:
-            for submob in self.submobjects:
-                submob.fix_in_frame(family)
+        mobs = self.get_family() if family else [self]
+        for mob in mobs:
+            mob.is_fixed_in_frame = True
         return self
 
     def unfix_from_frame(self, family=True):
-        self.is_fixed_in_frame = False
-        if family:
-            for submob in self.submobjects:
-                submob.unfix_from_frame(family)
+        mobs = self.get_family() if family else [self]
+        for mob in mobs:
+            mob.is_fixed_in_frame = False
         return self
 
     def apply_depth_test(self, family=True):
-        self.depth_test = True
-        if family:
-            for submob in self.submobjects:
-                submob.apply_depth_test(family)
+        mobs = self.get_family() if family else [self]
+        for mob in mobs:
+            mob.depth_test = True
         return self
 
     def deactivate_depth_test(self, family=True):
-        self.depth_test = False
-        if family:
-            for submob in self.submobjects:
-                submob.deactivate_depth_test(family)
+        mobs = self.get_family() if family else [self]
+        for mob in mobs:
+            mob.depth_test = False
         return self
 
     # Positioning methods
@@ -1061,6 +1057,7 @@ class Mobject(Container):
             for submob in self.submobjects:
                 submob.shuffle(recursive=True)
         random.shuffle(self.submobjects)
+        return self
 
     # Just here to keep from breaking old scenes.
     def arrange_submobjects(self, *args, **kwargs):