From 08f75917876e1e50f7a7c1a4c9f051a12355b117 Mon Sep 17 00:00:00 2001
From: AlessandroSigna <alesigna92@gmail.com>
Date: Wed, 16 Dec 2015 10:02:47 -0800
Subject: [PATCH] Fix misspelling

---
 interface/src/ui/overlays/Image3DOverlay.cpp     | 16 ++++++++--------
 interface/src/ui/overlays/Image3DOverlay.h       |  2 +-
 .../render-utils/src/DeferredLightingEffect.cpp  |  4 ++--
 .../render-utils/src/DeferredLightingEffect.h    |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp
index 6e4c274943..7d105a6ccf 100644
--- a/interface/src/ui/overlays/Image3DOverlay.cpp
+++ b/interface/src/ui/overlays/Image3DOverlay.cpp
@@ -27,7 +27,7 @@ QString const Image3DOverlay::TYPE = "image3d";
 
 Image3DOverlay::Image3DOverlay() {
     _isLoaded = false;
-    _emmisive = false;
+    _emissive = false;
 }
 
 Image3DOverlay::Image3DOverlay(const Image3DOverlay* image3DOverlay) :
@@ -35,7 +35,7 @@ Image3DOverlay::Image3DOverlay(const Image3DOverlay* image3DOverlay) :
     _url(image3DOverlay->_url),
     _texture(image3DOverlay->_texture),
     _fromImage(image3DOverlay->_fromImage),
-    _emmisive(image3DOverlay->_emmisive)
+    _emissive(image3DOverlay->_emissive)
 {
 }
 
@@ -96,7 +96,7 @@ void Image3DOverlay::render(RenderArgs* args) {
     batch->setModelTransform(transform);
     batch->setResourceTexture(0, _texture->getGPUTexture());
 
-    DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(*batch, true, false, _emmisive, true);
+    DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(*batch, true, false, _emissive, true);
     DependencyManager::get<GeometryCache>()->renderQuad(
         *batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight,
         glm::vec4(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha)
@@ -147,9 +147,9 @@ void Image3DOverlay::setProperties(const QScriptValue &properties) {
         }
     }
 
-    QScriptValue emmisiveValue = properties.property("emmisive");
-    if (emmisiveValue.isValid()) {
-        _emmisive = emmisiveValue.toBool();
+    QScriptValue emissiveValue = properties.property("emissive");
+    if (emissiveValue.isValid()) {
+        _emissive = emissiveValue.toBool();
     }
 }
 
@@ -163,8 +163,8 @@ QScriptValue Image3DOverlay::getProperty(const QString& property) {
     if (property == "offsetPosition") {
         return vec3toScriptValue(_scriptEngine, getOffsetPosition());
     }
-    if (property == "emmisive") {
-        return _emmisive;
+    if (property == "emissive") {
+        return _emissive;
     }
 
     return Billboard3DOverlay::getProperty(property);
diff --git a/interface/src/ui/overlays/Image3DOverlay.h b/interface/src/ui/overlays/Image3DOverlay.h
index 0e40c73619..f2cc3789ee 100644
--- a/interface/src/ui/overlays/Image3DOverlay.h
+++ b/interface/src/ui/overlays/Image3DOverlay.h
@@ -46,7 +46,7 @@ public:
 private:
     QString _url;
     NetworkTexturePointer _texture;
-    bool _emmisive;
+    bool _emissive;
 
     QRect _fromImage; // where from in the image to sample
 };
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 10b58b156b..dcadaa5177 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -169,8 +169,8 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) {
 
 
 gpu::PipelinePointer DeferredLightingEffect::bindSimpleProgram(gpu::Batch& batch, bool textured, bool culled,
-                                               bool emmisive, bool depthBias) {
-    SimpleProgramKey config{textured, culled, emmisive, depthBias};
+                                               bool emissive, bool depthBias) {
+    SimpleProgramKey config{textured, culled, emissive, depthBias};
     gpu::PipelinePointer pipeline = getPipeline(config);
     batch.setPipeline(pipeline);
 
diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h
index 9c4809a82e..eee5993c29 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.h
+++ b/libraries/render-utils/src/DeferredLightingEffect.h
@@ -38,7 +38,7 @@ public:
 
     /// Sets up the state necessary to render static untextured geometry with the simple program.
     gpu::PipelinePointer bindSimpleProgram(gpu::Batch& batch, bool textured = false, bool culled = true,
-                           bool emmisive = false, bool depthBias = false);
+                           bool emissive = false, bool depthBias = false);
 
     void renderSolidSphereInstance(gpu::Batch& batch, const Transform& xfm, const glm::vec4& color);
     void renderSolidSphereInstance(gpu::Batch& batch, const Transform& xfm, const glm::vec3& color) {