Merge b2f1d04 into 9e51288

solvespace · Feb 19, 2019 · 4bd41c0 · 4bd41c0
2 parents 9e51288 + b2f1d04
commit 4bd41c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -77,6 +77,8 @@ Other new features:
   * The "=" key is bound to "Zoom In", like "+" key.
   * The numpad decimal separator key is bound to "." regardless of locale.
   * On Windows, full-screen mode is implemented.
+  * When linking a sketch file, missing custom styles are imported from the
+    linked file.
 
 Bugs fixed:
   * A point in 3d constrained to any line whose length is free no longer

diff --git a/src/file.cpp b/src/file.cpp
@@ -732,7 +732,13 @@ bool SolveSpaceUI::LoadEntitiesFromFile(const Platform::Path &filename, EntityLi
         } else if(strcmp(line, "AddConstraint")==0) {
 
         } else if(strcmp(line, "AddStyle")==0) {
-
+            // Linked file contains a style that we don't have yet,
+            // so import it.
+            if (SK.style.FindByIdNoOops(sv.s.h) == nullptr) {
+                SK.style.Add(&(sv.s));
+            }
+            sv.s = {};
+            Style::FillDefaultStyle(&sv.s);
         } else if(strcmp(line, VERSION_STRING)==0) {
 
         } else if(StrStartsWith(line, "Triangle ")) {