remove call to _entities.render() in displaySide()

Brad Hefta-Gaub committed 11 years ago

Commit 416acb11 parent 6edc8173 files · +3 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+1−2

@@ -1063,7 +1063,7 @@ void Application::paintGL() { · 1062 unmodified lines
1063	1063	auto lodManager = DependencyManager::get<LODManager>();
1064	1064
1065	1065
1066		− RenderArgs renderArgs(_gpuContext, nullptr, getViewFrustum(), lodManager->getOctreeSizeScale(),
	1066	+ RenderArgs renderArgs(_gpuContext, getEntities(), getViewFrustum(), lodManager->getOctreeSizeScale(),
1067	1067	lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE,
1068	1068	RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
1069	1069
@@ -3562,7 +3562,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 2492 unmodified lines
3562	3562	(RenderArgs::DebugFlags) (renderDebugFlags \| (int)RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP);
3563	3563	}
3564	3564	renderArgs->_debugFlags = renderDebugFlags;
3565		− _entities.render(renderArgs);
3566	3565	//ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, pendingChanges);
3567	3566	}
3568	3567	}