Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop some unused boost lexical_cast includes and associated MSVC pragmas.

Browse Source
This commit is contained in:
Router Gray
2020-05-20 21:09:15 -05:00
parent 3e78b74474
commit 518da73ad2
8 changed files with 23 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
indra/llprimitive/lldaeloader.cpp
View File

@@ -24,35 +24,29 @@
* $/LicenseInfo$
*/
#if LL_MSVC
#pragma warning (disable : 4263)
#pragma warning (disable : 4264)
#endif
#include "dae.h"
#include "dom/domAsset.h"
#include "dom/domBind_material.h"
#include "dom/domCOLLADA.h"
#include "dom/domConstants.h"
#include "dom/domController.h"
#include "dom/domEffect.h"
#include "dom/domGeometry.h"
#include "dom/domInstance_geometry.h"
#include "dom/domInstance_material.h"
#include "dom/domInstance_node.h"
#include "dom/domInstance_effect.h"
#include "dom/domMaterial.h"
#include "dom/domMatrix.h"
#include "dom/domNode.h"
#include "dom/domProfile_COMMON.h"
#include "dom/domRotate.h"
#include "dom/domScale.h"
#include "dom/domTranslate.h"
#include "dom/domVisual_scene.h"
#if LL_MSVC
#pragma warning (default : 4263)
#pragma warning (default : 4264)
#endif
#include <dae.h>
#include <dom/domAsset.h>
#include <dom/domBind_material.h>
#include <dom/domCOLLADA.h>
#include <dom/domConstants.h>
#include <dom/domController.h>
#include <dom/domEffect.h>
#include <dom/domGeometry.h>
#include <dom/domInstance_geometry.h>
#include <dom/domInstance_material.h>
#include <dom/domInstance_node.h>
#include <dom/domInstance_effect.h>
#include <dom/domMaterial.h>
#include <dom/domMatrix.h>
#include <dom/domNode.h>
#include <dom/domProfile_COMMON.h>
#include <dom/domRotate.h>
#include <dom/domScale.h>
#include <dom/domTranslate.h>
#include <dom/domVisual_scene.h>
#include <boost/algorithm/string/replace.hpp>
#include <boost/regex.hpp>
#include "lldaeloader.h"
#include "llsdserialize.h"
@@ -60,8 +54,6 @@
#include "llmatrix4a.h"
#include <boost/regex.hpp>
#include <boost/algorithm/string/replace.hpp>
std::string colladaVersion[VERSIONTYPE_COUNT+1] =
{
@@ -80,6 +72,7 @@ static const std::string lod_suffix[LLModel::NUM_LODS] =
};
const U32 LIMIT_MATERIALS_OUTPUT = 12;
bool get_dom_sources(const domInputLocalOffset_Array& inputs, S32& pos_offset, S32& tc_offset, S32& norm_offset, S32 &idx_stride,
domSource* &pos_source, domSource* &tc_source, domSource* &norm_source)
{