Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflict fix

Browse source
This commit is contained in:
ZappoMan 2013-05-08 18:07:33 -07:00
parent 5cfbcc5caa
commit cadc07c63d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
voxel-edit/src/main.cpp
View file

@ -24,7 +24,7 @@ void addLandscape(VoxelTree * tree) {
printf("Adding Landscape...\n"); printf("Adding Landscape...\n");
} }
void addScene(VoxelTree * tree) { void voxelTutorial(VoxelTree * tree) {
printf("adding scene...\n"); printf("adding scene...\n");
// We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so... // We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...