add ComboBox node, add blend modes button in stroke panel, move brush shader code to ShaderManager and avoid the same shader being recompiled many times

2017-11-12 03:02:40 +00:00
parent fa4e67617b
commit daaa7f9d48
16 changed files with 154 additions and 54 deletions
--- a/engine.vcxproj.filters
+++ b/engine.vcxproj.filters
@@ -234,6 +234,9 @@
    <ClCompile Include="engine\app_cloud.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="engine\node_combobox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="engine\app.h">
@@ -413,6 +416,9 @@
    <ClInclude Include="engine\node_dialog_cloud.h">
      <Filter>Header Files\ui</Filter>
    </ClInclude>
+    <ClInclude Include="engine\node_combobox.h">
+      <Filter>Header Files\ui</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="PanoPainter.rc">