From 8585e8a7631e8db10dff140bcd046100b9ae6b88 Mon Sep 17 00:00:00 2001
From: Jeremy Hu <huxingyi@msn.com>
Date: Sun, 3 Nov 2019 12:42:58 +0930
Subject: [PATCH] Update screenshot and changelogs

---
 CHANGELOGS.md             | 11 +++++++++++
 README.md                 |  2 +-
 languages/dust3d_zh_CN.ts |  8 ++++----
 resources.qrc             |  1 +
 src/documentwindow.cpp    |  1 +
 src/texturegenerator.cpp  |  2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index e50866d0..359106d0 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,3 +1,14 @@
+Changes between 1.0.0-beta.25 and 1.0.0-beta.26:
+--------------------------------------------------
+- Fix undo for part tree widget  
+- Add experiment auto colorizing (Thanks @enzyme69)  
+- Improve mesh generation, more average edge length    
+- Fix icon naming issue for icon themes (Thanks @creepertron95)  
+- Add tile scale setting for texture generator  
+- Add color transparency support  
+- Remove built-in example model: Bob  
+- Add built-in example model: Giraffe  
+
 Changes between 1.0.0-beta.24 and 1.0.0-beta.25:
 --------------------------------------------------
 - Add shortcuts key F: bring part widget of hovered part to visible area
diff --git a/README.md b/README.md
index 2891ae53..f3dc36c3 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Dust3D is a brand new 3D modeling software. It helps you create a 3D watertight
 
 Screenshots
 ----------------------
-<a href="https://github.com/Dust3D-Modeling/10minuteseveryday/tree/master/jeremyhu2016/audi-80-1990"><image src="https://raw.githubusercontent.com/Dust3D-Modeling/10minuteseveryday/master/jeremyhu2016/audi-80-1990/audi-80-1990.png" width="358" height="216"></a>
+<a href="https://github.com/Dust3D-Modeling/10minuteseveryday/tree/master/jeremyhu2016/giraffe"><image src="https://raw.githubusercontent.com/Dust3D-Modeling/10minuteseveryday/master/jeremyhu2016/giraffe/giraffe.png" width="358" height="216"></a>
 
 
 <a href="https://github.com/Dust3D-Modeling/10minuteseveryday/tree/master/jeremyhu2016/honda-monkey"><image src="https://raw.githubusercontent.com/Dust3D-Modeling/10minuteseveryday/master/jeremyhu2016/honda-monkey/honda-monkey.png" width="358" height="216"></a>
diff --git a/languages/dust3d_zh_CN.ts b/languages/dust3d_zh_CN.ts
index a7e9e5aa..14d28069 100644
--- a/languages/dust3d_zh_CN.ts
+++ b/languages/dust3d_zh_CN.ts
@@ -475,6 +475,10 @@ Tips:
         <source>New</source>
         <translation>新建</translation>
     </message>
+    <message>
+        <source>Tile Scale</source>
+        <translation>平铺缩放</translation>
+    </message>
 </context>
 <context>
     <name>MaterialListWidget</name>
@@ -791,10 +795,6 @@ Tips:
         <source>Transparency</source>
         <translation>透明度</translation>
     </message>
-    <message>
-        <source>Tile Scale</source>
-        <translation>平铺缩放</translation>
-    </message>
 </context>
 <context>
     <name>PoseEditWidget</name>
diff --git a/resources.qrc b/resources.qrc
index 74d70daf..fa25e175 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -10,6 +10,7 @@
     <file>resources/model-addax.ds3</file>
     <file>resources/model-bicycle.ds3</file>
     <file>resources/model-dog-head.ds3</file>
+    <file>resources/model-giraffe.ds3</file>
     <file>resources/model-meerkat.ds3</file>
     <file>resources/model-mosquito.ds3</file>
     <file>resources/model-seagull.ds3</file>
diff --git a/src/documentwindow.cpp b/src/documentwindow.cpp
index 14b7ac49..022acb04 100644
--- a/src/documentwindow.cpp
+++ b/src/documentwindow.cpp
@@ -428,6 +428,7 @@ DocumentWindow::DocumentWindow() :
         "Addax",
         "Bicycle",
         "Dog head",
+        "Giraffe",
         "Meerkat",
         "Mosquito",
         "Seagull",
diff --git a/src/texturegenerator.cpp b/src/texturegenerator.cpp
index 192c2534..acdca994 100644
--- a/src/texturegenerator.cpp
+++ b/src/texturegenerator.cpp
@@ -11,7 +11,7 @@
 #include "material.h"
 
 int TextureGenerator::m_textureSize = 1024;
-QColor TextureGenerator::m_defaultTextureColor = Qt::transparent; //Qt::darkGray;
+QColor TextureGenerator::m_defaultTextureColor = Qt::transparent;
 
 TextureGenerator::TextureGenerator(const Outcome &outcome, Snapshot *snapshot) :
     m_resultTextureGuideImage(nullptr),