Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/add-textures-buoys' into add-tex…
Browse files Browse the repository at this point in the history
…tures-buoys
  • Loading branch information
Keith-Khadar committed Apr 20, 2023
2 parents 8c7c42a + 7763de8 commit 890931d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<technique sid="common">
<lambert>
<emission>
<color sid="emission">0 0 0 1</color>
<color sid="emission">255 255 255 1</color>
</emission>
<diffuse>
<texture texture="_2_makeGrade_tommyGun_png-sampler" texcoord="UVMap"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>file://Bootlegger_Posters/Bootlegger_Buoy.dae</uri>
<uri>file://Bootlegger_Poster/Bootlegger_Buoy.dae</uri>
</mesh>
</geometry>
</collision>
Expand All @@ -29,7 +29,7 @@
<geometry>
<mesh>
<scale>1 1 1</scale>
<uri>file://Bootlegger_Posters/Bootlegger_Buoy.dae</uri>
<uri>file://Bootlegger_Poster/Bootlegger_Buoy.dae</uri>
</mesh>
</geometry>
</visual>
Expand Down

0 comments on commit 890931d

Please sign in to comment.