Merge branch 'nwnds_acidchalk'
This commit is contained in:
@@ -324,7 +324,11 @@ node trimesh nmc_082375e0
|
||||
shininess 1
|
||||
shadow 0
|
||||
rotatetexture 1
|
||||
<<<<<<< HEAD
|
||||
bitmap ttd21_sand01
|
||||
=======
|
||||
bitmap trd21_sand08
|
||||
>>>>>>> nwnds_acidchalk
|
||||
orientation 0 0 0 0
|
||||
scale 1
|
||||
alpha 1
|
||||
@@ -389,7 +393,11 @@ node trimesh nmc_08237ab8
|
||||
shininess 1
|
||||
shadow 0
|
||||
rotatetexture 1
|
||||
<<<<<<< HEAD
|
||||
bitmap ttd21_sand01
|
||||
=======
|
||||
bitmap trd21_sand08
|
||||
>>>>>>> nwnds_acidchalk
|
||||
orientation 0 0 0 0
|
||||
scale 1
|
||||
alpha 1
|
||||
|
||||
Reference in New Issue
Block a user