CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict

Browse Source
This commit is contained in:
Modnark
2022-10-11 22:38:34 -04:00
parent d32b0ea4e4
commit 2dc7f3e667
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/DataModelV2/PartInstance.h
View File

@@ -16,7 +16,8 @@ public:
//Rendering //Rendering
virtual void PartInstance::postRender(RenderDevice* rd); virtual void PartInstance::postRender(RenderDevice* rd);
virtual void render(RenderDevice*); virtual void render(RenderDevice*);
virtual void renderName(RenderDevice*);
//Surfaces //Surfaces
Enum::SurfaceType::Value top; Enum::SurfaceType::Value top;
Enum::SurfaceType::Value front; Enum::SurfaceType::Value front;