From 2eebfb9cf1983ed9be99c01869ae2a11f3062e38 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 25 Apr 2015 12:50:16 -0700 Subject: [PATCH] merge from upstream --- libraries/render-utils/src/Model.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index fdb448ea14..fe82af6b3c 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -139,10 +139,6 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, // Good to go add the brand new pipeline auto pipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, state)); -<<<<<<< HEAD - // auto it = -======= ->>>>>>> 3ce65d297a31c83c06f8838dd21ca128b59cef59 insert(value_type(key.getRaw(), RenderPipeline(pipeline, locations))); // If not a shadow pass, create the mirror version from the same state, just change the FrontFace