Merge remote-tracking branch 'upstream/master' into plugins

Bradley Austin Davis committed 11 years ago

Commit 0efa2c02 parents 9727302 f3dc1593 files · +13 −6Browse files

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

Unified · Split

interface/src/Application.cpp+1−0

@@ -3541,6 +3541,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3540 unmodified lines
3541	sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems);	3541	sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems);
3542	sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);	3542	sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);
3543	}	3543	}
		3544
3544	//Render the sixense lasers	3545	//Render the sixense lasers
3545	if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers)) {	3546	if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers)) {
3546	_myAvatar->renderLaserPointers(*renderArgs->_batch);	3547	_myAvatar->renderLaserPointers(*renderArgs->_batch);