public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
YishiMichael 2022-05-28 12:40:29 +08:00
parent 9386461d27
commit 22a3bef670
No known key found for this signature in database
GPG key ID: EC615C0C5A86BC80
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manimlib/animation/transform_matching_parts.py
View file

@ -192,6 +192,8 @@ class TransformMatchingStrings(AnimationGroup):
target_indices_lists, target_indices target_indices_lists, target_indices
) )
if not source_indices_lists or not target_indices_lists: if not source_indices_lists or not target_indices_lists:
source_indices.extend(it.chain(*source_indices_lists))
target_indices.extend(it.chain(*target_indices_lists))
continue continue
anims.append(anim_class( anims.append(anim_class(
source.build_parts_from_indices_lists(source_indices_lists), source.build_parts_from_indices_lists(source_indices_lists),

14
manimlib/mobject/svg/svg_mobject.py
View file

@ -116,15 +116,13 @@ class SVGMobject(VMobject):
"style" "style"
) )
root = element_tree.getroot() root = element_tree.getroot()
style_attrs = {} style_attrs = {
rest_attrs = {} k: v
for k, v in root.attrib.items(): for k, v in root.attrib.items()
if k in style_keys: if k in style_keys
style_attrs[k] = v }
else:
rest_attrs[k] = v
new_root = ET.Element("svg", rest_attrs) new_root = ET.Element("svg", {}) # TODO: width, height
config_style_node = ET.SubElement(new_root, "g", config_style_attrs) config_style_node = ET.SubElement(new_root, "g", config_style_attrs)
root_style_node = ET.SubElement(config_style_node, "g", style_attrs) root_style_node = ET.SubElement(config_style_node, "g", style_attrs)
root_style_node.extend(root) root_style_node.extend(root)