From 1fb2dd4460e202449dd3468fd5a408b6737bddae Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 16 Oct 2014 15:13:45 -0700
Subject: [PATCH 1/4] use OPENSSL_free to free DER private and public key
 buffers

---
 libraries/networking/src/RSAKeypairGenerator.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/networking/src/RSAKeypairGenerator.cpp b/libraries/networking/src/RSAKeypairGenerator.cpp
index 0112f33ded..a51a17c0ca 100644
--- a/libraries/networking/src/RSAKeypairGenerator.cpp
+++ b/libraries/networking/src/RSAKeypairGenerator.cpp
@@ -66,11 +66,11 @@ void RSAKeypairGenerator::generateKeypair() {
         
         // cleanup the public and private key DER data, if required
         if (publicKeyLength > 0) {
-            delete[] publicKeyDER;
+            OPENSSL_free(publicKeyDER);
         }
         
         if (privateKeyLength > 0) {
-            delete[] privateKeyDER;
+            OPENSSL_free(privateKeyDER);
         }
         
         return;
@@ -84,8 +84,8 @@ void RSAKeypairGenerator::generateKeypair() {
     QByteArray privateKeyArray(reinterpret_cast<char*>(privateKeyDER), privateKeyLength);
     
     // cleanup the publicKeyDER and publicKeyDER data
-    delete[] publicKeyDER;
-    delete[] privateKeyDER;
+    OPENSSL_free(publicKeyDER);
+    OPENSSL_free(privateKeyDER);
     
     emit generatedKeypair(publicKeyArray, privateKeyArray);
 }
\ No newline at end of file

From 47f5d499f613df5046998b2d6b717161b306c966 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 16 Oct 2014 15:26:01 -0700
Subject: [PATCH 2/4] small optimization

---
 interface/src/renderer/Model.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index 1228a458b2..3800e78008 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -1563,6 +1563,11 @@ int Model::renderMeshes(RenderMode mode, bool translucent, float alphaThreshold,
     }
     QVector<int>& list = *whichList;
 
+    // If this list has nothing to render, then don't bother proceeding. This saves us on binding to programs    
+    if (list.size() == 0) {
+        return 0;
+    }
+
     ProgramObject* program = &_program;
     Locations* locations = &_locations;
     ProgramObject* skinProgram = &_skinProgram;

From 843a64eeee6600d77356983c85ea67a7079bcee6 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Thu, 16 Oct 2014 16:15:01 -0700
Subject: [PATCH 3/4] Check for msdev version and appropriate window sdk

---
 CMakeLists.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62cdc925f3..b421040a50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,13 @@ if (WIN32)
   # set path for Microsoft SDKs
   # if get build error about missing 'glu32' this path is likely wrong
   # Uncomment the line with 8.1 if running Windows 8.1
-  #set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x86")
-  set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 ")
+  if (MSVC10)
+    set(WINDOW_SDK_PATH "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 ")
+  elseif (MSVC12)
+    set(WINDOW_SDK_PATH "C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x86 ")
+  endif ()
+  message (WINDOW_SDK_PATH= ${WINDOW_SDK_PATH})
+  set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${WINDOW_SDK_PATH})
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")

From c44a59203253adaae3db03a21f40776b2f5e8e55 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 16 Oct 2014 16:21:59 -0700
Subject: [PATCH 4/4] longer lengths for experimental hair

---
 interface/src/Hair.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Hair.h b/interface/src/Hair.h
index 036d137cd3..f2b5ebde6a 100644
--- a/interface/src/Hair.h
+++ b/interface/src/Hair.h
@@ -26,7 +26,7 @@ const int HAIR_CONSTRAINTS = 2;
 const int DEFAULT_HAIR_STRANDS = 20;
 const int DEFAULT_HAIR_LINKS = 10;
 const float DEFAULT_HAIR_RADIUS = 0.15f;
-const float DEFAULT_HAIR_LINK_LENGTH = 0.04f;
+const float DEFAULT_HAIR_LINK_LENGTH = 0.07f;
 const float DEFAULT_HAIR_THICKNESS = 0.025f;
 
 class Hair {