Skip to content

Commit e3156e1

Browse files
committed
Fix assetion fail in drawOrder enabled
1 parent 5130ba6 commit e3156e1

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

core/2d/DrawNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ void DrawNode::_drawPolygon(const Vec2* verts,
830830

831831
auto _vertices = _transform(verts, count, closedPolygon);
832832

833-
std::vector<V2F_C4F_T2F_Triangle> triangleList;
833+
axstd::pod_vector<V2F_C4F_T2F_Triangle> triangleList;
834834

835835
int vertex_count = 0;
836836

core/renderer/CustomCommand.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ void CustomCommand::setVertexBuffer(backend::Buffer* vertexBuffer)
201201
AX_SAFE_RELEASE(_vertexBuffer);
202202
_vertexBuffer = vertexBuffer;
203203
AX_SAFE_RETAIN(_vertexBuffer);
204+
205+
if (!_vertexBuffer)
206+
_vertexCapacity = _vertexDrawCount = 0;
204207
}
205208

206209
void CustomCommand::setIndexBuffer(backend::Buffer* indexBuffer, IndexFormat format)
@@ -214,6 +217,9 @@ void CustomCommand::setIndexBuffer(backend::Buffer* indexBuffer, IndexFormat for
214217

215218
_indexFormat = format;
216219
_indexSize = computeIndexSize();
220+
221+
if(!_indexBuffer)
222+
_indexCapacity = _indexDrawCount = 0;
217223
}
218224

219225
void CustomCommand::updateVertexBuffer(const void* data, std::size_t length)

0 commit comments

Comments
 (0)