From 09e1d7b091b4cd207372f6a06fd43be1b4fd2efc Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 23 Apr 2012 15:28:00 +0000
Subject: [PATCH] Fix #31056: SVG importer ignores fill color from parent
container
Additional changes:
- Fixed wrong pop of rectangle area (function wasn't called)
- Removed unused code
---
io_curve_svg/import_svg.py | 38 +++++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
diff --git a/io_curve_svg/import_svg.py b/io_curve_svg/import_svg.py
index 8d49f6134..1c04eb534 100644
--- a/io_curve_svg/import_svg.py
+++ b/io_curve_svg/import_svg.py
@@ -428,6 +428,9 @@ def SVGParseStyles(node, context):
styles['useFill'] = True
styles['fill'] = SVGGetMaterial(fill, context)
+ if styles['useFill'] is None and context['style']:
+ styles = context['style'].copy()
+
if styles['useFill'] is None:
styles['useFill'] = True
styles['fill'] = SVGGetMaterial('#000', context)
@@ -887,7 +890,6 @@ class SVGPathParser:
Elliptical arc CurveTo path command
"""
- # c = code.lower() # UNUSED
cur = self._data.cur()
while cur is not None and not cur.isalpha():
@@ -981,7 +983,7 @@ class SVGGeometry:
Pop display rectangle
"""
- self._context['rects'].pop
+ self._context['rects'].pop()
self._context['rect'] = self._context['rects'][-1]
def _pushMatrix(self, matrix):
@@ -1000,6 +1002,22 @@ class SVGGeometry:
matrix = self._context['transform'].pop()
self._context['matrix'] = self._context['matrix'] * matrix.inverted()
+ def _pushStyle(self, style):
+ """
+ Push style
+ """
+
+ self._context['styles'].append(style)
+ self._context['style'] = style
+
+ def _popStyle(self):
+ """
+ Pop style
+ """
+
+ self._context['styles'].pop()
+ self._context['style'] = self._context['styles'][-1]
+
def _transformCoord(self, point):
"""
Transform SVG-file coords
@@ -1069,7 +1087,8 @@ class SVGGeometryContainer(SVGGeometry):
Container of SVG geometries
"""
- __slots__ = ('_geometries') # List of chold geometries
+ __slots__ = ('_geometries', # List of chold geometries
+ '_styles') # Styles, used for displaying
def __init__(self, node, context):
"""
@@ -1079,12 +1098,18 @@ class SVGGeometryContainer(SVGGeometry):
super().__init__(node, context)
self._geometries = []
+ self._styles = SVGEmptyStyles
def parse(self):
"""
Parse XML node to memory
"""
+ if type(self._node) is xml.dom.minidom.Element:
+ self._styles = SVGParseStyles(self._node, self._context)
+
+ self._pushStyle(self._styles)
+
for node in self._node.childNodes:
if type(node) is not xml.dom.minidom.Element:
continue
@@ -1093,6 +1118,8 @@ class SVGGeometryContainer(SVGGeometry):
if ob is not None:
self._geometries.append(ob)
+ self._popStyle()
+
def _doCreateGeom(self, instancing):
"""
Create real geometries
@@ -1244,7 +1271,6 @@ class SVGGeometryUSE(SVGGeometry):
Create real geometries
"""
- # geometries = [] # UNUSED
ref = self._node.getAttribute('xlink:href')
geom = self._context['defines'].get(ref)
@@ -1765,7 +1791,9 @@ class SVGLoader(SVGGeometryContainer):
'rects': [rect],
'rect': rect,
'matrix': m,
- 'materials': {}}
+ 'materials': {},
+ 'styles': [None],
+ 'style': None}
super().__init__(node, self._context)
--
GitLab