Skip to content

Commit

Permalink
lighting: Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vlj committed Jan 6, 2024
1 parent 80f5d41 commit 202c407
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/display3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,6 @@ static void drawTiles(iView *player, LightingData& lightData, LightMap& lightmap
tileScreenInfo[idx][jdx].z = pie_RotateProjectWithPerspective(&pos, tileCalcPerspectiveViewMatrix, &screen);
tileScreenInfo[idx][jdx].x = screen.x;
tileScreenInfo[idx][jdx].y = screen.y;
>>>>>>> 57d397b33ec953c53feaca70743356cca61d0b61
}
}

Expand Down

0 comments on commit 202c407

Please sign in to comment.