opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-30 05:24:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lighthouse2

Browse Source 
# Conflicts:
#	.gitignore -> resolved
This commit is contained in:
Ben Hambrecht
2018-02-08 12:07:33 +01:00
parent 7871e557d2 ff32a7c6a4
commit 87811976d4
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobject/mobject.py
View File

@ -771,10 +771,10 @@ class Mobject(Container):
self.null_point_align(mobject)
self_count = len(self.submobjects)
mob_count = len(mobject.submobjects)
diff = abs(self_count-mob_count)
if self_count < mob_count:
self.add_n_more_submobjects(diff)
elif mob_count < self_count:
diff = self_count-mob_count
if diff < 0:
self.add_n_more_submobjects(-diff)
elif diff > 0:
mobject.add_n_more_submobjects(diff)
return self