Skip to content

Commit 77167bb

Browse files
author
nitrocaster
committed
Fix plugins compilation.
1 parent b69be81 commit 77167bb

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

src/editors/ECore/Editor/EditMesh.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -199,22 +199,22 @@ class CSector;
199199
#endif
200200

201201
class ECORE_API CEditableMesh{
202-
friendclass MeshExpUtility;
203-
friendclass CEditableObject;
204-
friendclass CSectorItem;
205-
friendclass CSector;
206-
friendclass CPortalUtils;
207-
friendclass SceneBuilder;
208-
friendclass CExportSkeleton;
209-
friendclass CExportObjectOGF;
210-
friendclass TfrmEditLibrary;
211-
friendclass CExporter;
212-
friendclass CXRayObjectExport;
213-
friendclass CXRaySkinExport;
202+
friend class MeshExpUtility;
203+
friend class CEditableObject;
204+
friend class CSectorItem;
205+
friend class CSector;
206+
friend class CPortalUtils;
207+
friend class SceneBuilder;
208+
friend class CExportSkeleton;
209+
friend class CExportObjectOGF;
210+
friend class TfrmEditLibrary;
211+
friend class CExporter;
212+
friend class CXRayObjectExport;
213+
friend class CXRaySkinExport;
214214

215215
shared_str m_Name;
216216

217-
CEditableObject*m_Parent;
217+
CEditableObject *m_Parent;
218218

219219
void GenerateCFModel();
220220
void GenerateRenderBuffers();

src/editors/ECore/Editor/EditObjectImport.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
extern "C"
1414
{
15-
#include "utils/LWO/lwo2.h" };
15+
#include "utils/LWO/lwo2.h"
16+
};
1617

1718
#ifdef _EDITOR
1819
#include "Layers/xrRender/ResourceManager.h"

src/editors/ECore/Editor/ExportObjectOGFCalculateTB.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void CObjectOGFCollectorPacked::CalculateTB()
105105
NVMeshMender::DontWeightNormalsByFaceSize // weigh vertex normals by the triangle's size
106106
))
107107
{
108-
Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
108+
xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
109109
}
110110
111111
// Bind declarators
@@ -178,8 +178,8 @@ void CObjectOGFCollectorPacked::CalculateTB()
178178
)
179179
)
180180
{
181-
Debug.fatal ( DEBUG_INFO, "NVMeshMender failed " );
182-
//Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
181+
xrDebug::Fatal ( DEBUG_INFO, "NVMeshMender failed " );
182+
//xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
183183
}
184184

185185
retrive_data_from_mender_otput( m_Verts, m_Faces, mender_in_out_verts, mender_in_out_indices, mender_mapping_out_to_in_vert );

src/editors/ECore/Editor/ExportSkeletonCalculateTB.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void CExportSkeleton::SSplit::CalculateTB()
116116
NVMeshMender::DontWeightNormalsByFaceSize // weigh vertex normals by the triangle's size
117117
))
118118
{
119-
Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
119+
xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
120120
}
121121
122122
// verify
@@ -275,8 +275,8 @@ void CExportSkeleton::SSplit::CalculateTB ()
275275
)
276276
)
277277
{
278-
Debug.fatal ( DEBUG_INFO, "NVMeshMender failed " );
279-
//Debug.fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
278+
xrDebug::Fatal ( DEBUG_INFO, "NVMeshMender failed " );
279+
//xrDebug::Fatal (DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
280280
}
281281

282282
retrive_data_from_mender_otput( m_Verts, m_Faces, mender_in_out_verts, mender_in_out_indices, mender_mapping_out_to_in_vert );

src/plugins/Maya/Export/MayaExport.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ MStatus CXRayObjectExport::ExportPart(CEditableObject* O, MDagPath& mdagPath, MO
451451
// out face material
452452
int iTexture = texMap[meshPoly.index()];
453453
if (iTexture<0)
454-
Debug.fatal(DEBUG_INFO,"Can't find material for polygon: %d",meshPoly.index());
454+
xrDebug::Fatal(DEBUG_INFO,"Can't find material for polygon: %d",meshPoly.index());
455455
SXRShaderData& D= xr_data[iTexture];
456456

457457
int compIdx = meshPoly.index();
@@ -521,9 +521,9 @@ LPCSTR CXRayObjectExport::getMaterialName(MDagPath & mdagPath, int cid, int obje
521521
lastMaterials = currentMaterials;
522522

523523
int mLength = mArray.length();
524-
if (mLength==0) Debug.fatal(DEBUG_INFO,"Object '%s' has polygon '%d' without material.",0,cid);
524+
if (mLength==0) xrDebug::Fatal(DEBUG_INFO,"Object '%s' has polygon '%d' without material.",0,cid);
525525
if (mLength>1){
526-
Debug.fatal(DEBUG_INFO,"Object '%s' has polygon '%d' with more than one material.",0,cid);
526+
xrDebug::Fatal(DEBUG_INFO,"Object '%s' has polygon '%d' with more than one material.",0,cid);
527527
}
528528
}else{
529529
xr_delete(currentMaterials);

0 commit comments

Comments
 (0)