ArgonarioD 7ff8fd90c0 Merge branch 'main' into dev-LayerStyle ... # Conflicts: # ArchitectureColoredPainting/src/Editor/GraphicElement.cpp		2023-03-14 18:01:22 +08:00
..
HDRI	加入天空盒	2023-02-12 12:16:33 +08:00
Models/Sponza	模型添加彩绘配置文件	2023-03-09 15:44:14 +08:00
include	重构了Model和Mesh等，RendererGLWidget改用glad	2023-02-18 13:19:21 +08:00
res	实现彩绘纹理部分替换	2023-03-13 13:48:20 +08:00
src	Merge branch 'main' into dev-LayerStyle	2023-03-14 18:01:22 +08:00
ArchitectureColoredPainting.vcxproj	新增了ColorPicker类和StrokeStyleListView类	2023-03-14 17:57:58 +08:00
ArchitectureColoredPainting.vcxproj.filters	新增了ColorPicker类和StrokeStyleListView类	2023-03-14 17:57:58 +08:00
EditorWidget.ui	优化ui，剔除不必要部分	2023-03-08 12:16:15 +08:00
EditorWidgetItem.ui	bug: pixmap溢出	2023-03-13 23:36:31 +08:00
MainWindow.ui	解决线程无法析构的问题	2023-03-09 21:39:32 +08:00
RendererWidget.ui	模型添加彩绘配置文件	2023-03-09 15:44:14 +08:00