Skip to content

Commit 573a7f2

Browse files
committed
* FIX:[LE]Build Level
1 parent 736a04c commit 573a7f2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Source/Editors/LevelEditor/Edit/Builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class SceneBuilder{
6262
xr_vector<sb_light_control> l_light_control;
6363
xr_vector<b_light_static> l_light_static;
6464
xr_vector<b_light_dynamic> l_light_dynamic;
65-
xr_vector<b_texture> l_textures;
65+
xr_vector<b_texture_real> l_textures;
6666
xr_vector<b_shader> l_shaders;
6767
xr_vector<b_shader> l_shaders_xrlc;
6868
xr_vector<b_material> l_materials;

Source/Editors/LevelEditor/Edit/BuilderRemote.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void SceneBuilder::SaveBuildAsObject()
130130
for(u32 i=0;i<l_materials.size(); ++i)
131131
{
132132
b_material& m = l_materials[i];
133-
b_texture& t = l_textures[m.surfidx];
133+
b_texture_real& t = l_textures[m.surfidx];
134134
_splitpath (t.name, 0, tex_path, tex_name, 0 );
135135

136136
sprintf (tmp,"newmtl %s", tex_name);
@@ -185,13 +185,13 @@ void SceneBuilder::SaveBuildAsObject()
185185
total_tcs += idx*3;
186186

187187
//faces
188-
b_texture* last_texture = NULL;
188+
b_texture_real* last_texture = NULL;
189189
for(idx=0; idx<l_face_it; ++idx)
190190
{
191191
const b_face& it = l_faces[idx];
192192

193193
b_material& m = l_materials[it.dwMaterial];
194-
b_texture& t = l_textures[m.surfidx];
194+
b_texture_real& t = l_textures[m.surfidx];
195195
if(last_texture != &t)
196196
{
197197
_splitpath (t.name, 0, 0, tex_name, 0 );
@@ -234,7 +234,7 @@ void SceneBuilder::SaveBuildAsObject()
234234
const b_face& it = m.m_pFaces[fi];
235235

236236
b_material& m = l_materials[it.dwMaterial];
237-
b_texture& t = l_textures[m.surfidx];
237+
b_texture_real& t = l_textures[m.surfidx];
238238
if(last_texture != &t)
239239
{
240240
_splitpath (t.name, 0, 0, tex_name, 0 );
@@ -377,7 +377,7 @@ void SceneBuilder::SaveBuild()
377377
F->close_chunk ();
378378

379379
F->open_chunk (EB_Textures);
380-
F->w (l_textures.data(),sizeof(b_texture)*l_textures.size());
380+
F->w (l_textures.data(),sizeof(b_texture_real)*l_textures.size());
381381
F->close_chunk ();
382382

383383
F->open_chunk (EB_Glows);
@@ -1223,7 +1223,7 @@ int SceneBuilder::BuildTexture(const char* name)
12231223
}
12241224
int tex_idx = FindInTextures(name);
12251225
if(tex_idx<0){
1226-
b_texture tex;
1226+
b_texture_real tex;
12271227
ZeroMemory(&tex,sizeof(tex));
12281228
strcpy (tex.name,name);
12291229
l_textures.push_back(tex);

0 commit comments

Comments
 (0)