From 9daa219de943f568ab3e8c797995b5e559e2ada3 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 12 Jul 2015 11:31:37 +0400
Subject: [PATCH] new material definitions available in composite editor
---
js/menus/templates/CompositeMenuView.html | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/js/menus/templates/CompositeMenuView.html b/js/menus/templates/CompositeMenuView.html
index 47c20a23..b0acb80f 100644
--- a/js/menus/templates/CompositeMenuView.html
+++ b/js/menus/templates/CompositeMenuView.html
@@ -16,6 +16,16 @@ Available Materials:<br/>
<span><%= allMaterials[materialClass][key].name %></span></div>
</label>
<% }); %>
+ <% _.each(materials, function(material, key){
+ if (key.substr(0,5) == "super") return;
+ if (material.noDelete) return; %>
+ <label class="radio colorSwatches">
+ <input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
+ <div class="materialColorSwatch">
+ <div style="background-color:<% if(realisticColorScheme){ %><%= material.color %><% }else{ %><%= material.altColor %><% } %>"></div>
+ <span><%= material.name %></span></div>
+ </label>
+ <% }); %>
<% _.each(validCompositeMaterials, function(key){%>
<label class="radio colorSwatches">
<input type="radio" <%if (key == materialType){ %>checked<%}%> name="materialType" value="<%= key %>" data-toggle="radio" class="custom-radio appState"><span class="icons"><span class="icon-unchecked"></span><span class="icon-checked"></span></span>
--
GitLab