From e0ff0f2a9f46943b3e154fe9f07d9984f1782ff6 Mon Sep 17 00:00:00 2001 From: Ben Hambrecht Date: Wed, 11 Apr 2018 17:00:38 +0200 Subject: [PATCH] rearranged imports bc of GraphScene name conflict --- big_ol_pile_of_manim_imports.py | 20 +++++++++++--------- scene/graph_scene.py | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/big_ol_pile_of_manim_imports.py b/big_ol_pile_of_manim_imports.py index 9e941ec7..628367c3 100644 --- a/big_ol_pile_of_manim_imports.py +++ b/big_ol_pile_of_manim_imports.py @@ -46,6 +46,7 @@ from mobject.numbers import * from mobject.probability import * from mobject.shape_matchers import * from mobject.svg.brace import * +from mobject.svg.drawings import * from mobject.svg.svg_mobject import * from mobject.svg.tex_mobject import * from mobject.three_dimensions import * @@ -59,15 +60,6 @@ from for_3b1b_videos.pi_creature import * from for_3b1b_videos.pi_creature_animations import * from for_3b1b_videos.pi_creature_scene import * -from scene.graph_scene import * -from scene.moving_camera_scene import * -from scene.reconfigurable_scene import * -from scene.scene import * -from scene.scene_from_video import * -from scene.three_d_scene import * -from scene.vector_space_scene import * -from scene.zoomed_scene import * - from once_useful_constructs.arithmetic import * from once_useful_constructs.combinatorics import * from once_useful_constructs.complex_transformation_scene import * @@ -76,6 +68,16 @@ from once_useful_constructs.fractals import * from once_useful_constructs.graph_theory import * from once_useful_constructs.light import * +from scene.graph_scene import * +from scene.moving_camera_scene import * +from scene.reconfigurable_scene import * +from scene.scene import * +from scene.sample_space_scene import * +from scene.graph_scene import * +from scene.scene_from_video import * +from scene.three_d_scene import * +from scene.vector_space_scene import * +from scene.zoomed_scene import * from utils.bezier import * from utils.color import * diff --git a/scene/graph_scene.py b/scene/graph_scene.py index 3d014d62..5caec9e6 100644 --- a/scene/graph_scene.py +++ b/scene/graph_scene.py @@ -1,6 +1,7 @@ from __future__ import absolute_import from constants import * +import itertools as it from scene.scene import Scene from animation.creation import Write