diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-22 20:08:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-22 20:08:50 (GMT) |
| commit | 527a7a1ca6e1413ddf0ea27fe0fc60c4e9a060ca (patch) | |
| tree | 2f87d6ced8b714e18a52293d4126333b1e3cc42f /src/simulation/elements | |
| parent | f1e51ba9bc4d67f1fd4698290e546e0c98082ca9 (diff) | |
| parent | 392271a2692a2b764ae346e1f6ec70c1cb4277b7 (diff) | |
| download | powder-527a7a1ca6e1413ddf0ea27fe0fc60c4e9a060ca.zip powder-527a7a1ca6e1413ddf0ea27fe0fc60c4e9a060ca.tar.gz | |
Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/Element.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/simulation/elements/Element.cpp b/src/simulation/elements/Element.cpp index 9c1002a..322bdfa 100644 --- a/src/simulation/elements/Element.cpp +++ b/src/simulation/elements/Element.cpp @@ -53,6 +53,7 @@ std::vector<StructProperty> Element::GetProperties() std::vector<StructProperty> properties; properties.push_back(StructProperty("Name", StructProperty::String, offsetof(Element, Name))); properties.push_back(StructProperty("Colour", StructProperty::Colour, offsetof(Element, Colour))); + properties.push_back(StructProperty("Color", StructProperty::Colour, offsetof(Element, Colour))); properties.push_back(StructProperty("MenuVisible", StructProperty::Integer, offsetof(Element, MenuVisible))); properties.push_back(StructProperty("MenuSection", StructProperty::Integer, offsetof(Element, MenuSection))); properties.push_back(StructProperty("Advection", StructProperty::Float, offsetof(Element, Advection))); |