Browse Source

Merge pull request #56 from groud/fix_material

Fix the material tester buttons being hidden
Rémi Verschelde 8 years ago
parent
commit
0addda6d15
39 changed files with 48 additions and 6 deletions
  1. 6 3
      3d/material_testers/GodotBall.dae.import
  2. 1 0
      3d/material_testers/aluminium_albedo.png.import
  3. 1 0
      3d/material_testers/aluminium_flow.png.import
  4. 1 0
      3d/material_testers/aluminium_normal.png.import
  5. 1 0
      3d/material_testers/experiment.hdr.import
  6. 1 0
      3d/material_testers/lobby.hdr.import
  7. 1 0
      3d/material_testers/marble_albedo.png.import
  8. 1 0
      3d/material_testers/night.hdr.import
  9. 1 0
      3d/material_testers/park.hdr.import
  10. 6 3
      3d/material_testers/pbr_bed.dae.import
  11. 1 0
      3d/material_testers/rock_albedo.jpg.import
  12. 1 0
      3d/material_testers/rock_ao.jpg.import
  13. 1 0
      3d/material_testers/rock_depth.jpg.import
  14. 1 0
      3d/material_testers/rock_metal.jpg.import
  15. 1 0
      3d/material_testers/rock_rough.jpg.import
  16. 1 0
      3d/material_testers/sand_albedo.jpg.import
  17. 1 0
      3d/material_testers/sand_metal.jpg.import
  18. 1 0
      3d/material_testers/sand_normal.jpg.import
  19. 1 0
      3d/material_testers/sand_rough.jpg.import
  20. 1 0
      3d/material_testers/sand_shine.jpg.import
  21. 1 0
      3d/material_testers/schelde.hdr.import
  22. BIN
      3d/material_testers/tester.scn
  23. 1 0
      3d/material_testers/texture_bricks.jpg.import
  24. 1 0
      3d/material_testers/texture_bricks_depth.jpg.import
  25. 1 0
      3d/material_testers/texture_bricks_metal.jpg.import
  26. 1 0
      3d/material_testers/texture_bricks_normal.jpg.import
  27. 1 0
      3d/material_testers/texture_cheese_albedo.png.import
  28. 1 0
      3d/material_testers/texture_cheese_ao.png.import
  29. 1 0
      3d/material_testers/texture_cheese_depth.png.import
  30. 1 0
      3d/material_testers/texture_cheese_normal.png.import
  31. 1 0
      3d/material_testers/texture_rock_albedo.png.import
  32. 1 0
      3d/material_testers/texture_rock_ao.png.import
  33. 1 0
      3d/material_testers/texture_rock_depth.png.import
  34. 1 0
      3d/material_testers/texture_rock_metal.png.import
  35. 1 0
      3d/material_testers/texture_rock_normal.png.import
  36. 1 0
      3d/material_testers/texture_wood.png.import
  37. 1 0
      3d/material_testers/wool_albedo.png.import
  38. 1 0
      3d/material_testers/wool_depth.png.import
  39. 1 0
      3d/material_testers/wool_normal.png.import

+ 6 - 3
3d/material_testers/GodotBall.dae.import

@@ -9,11 +9,14 @@ path="res://.import/GodotBall.dae-7d94ed6d65f13de1df930390992b739e.scn"
 nodes/root_type="Spatial"
 nodes/root_name="Scene Root"
 nodes/custom_script=""
+nodes/storage=0
 materials/location=0
 materials/storage=0
-geometry/compress=true
-geometry/ensure_tangents=false
-geometry/storage=0
+materials/keep_on_reimport=false
+meshes/compress=true
+meshes/ensure_tangents=true
+meshes/storage=false
+external_files/store_in_subdir=true
 animation/import=true
 animation/fps=15
 animation/filter_script=""

+ 1 - 0
3d/material_testers/aluminium_albedo.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/aluminium_flow.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/aluminium_normal.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/experiment.hdr.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

+ 1 - 0
3d/material_testers/lobby.hdr.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

+ 1 - 0
3d/material_testers/marble_albedo.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/night.hdr.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

+ 1 - 0
3d/material_testers/park.hdr.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

+ 6 - 3
3d/material_testers/pbr_bed.dae.import

@@ -9,11 +9,14 @@ path="res://.import/pbr_bed.dae-a65f6f39b6a66a5680aec6e4308d1465.scn"
 nodes/root_type="Spatial"
 nodes/root_name="Scene Root"
 nodes/custom_script=""
+nodes/storage=0
 materials/location=0
 materials/storage=0
-geometry/compress=true
-geometry/ensure_tangents=true
-geometry/storage=0
+materials/keep_on_reimport=false
+meshes/compress=true
+meshes/ensure_tangents=true
+meshes/storage=false
+external_files/store_in_subdir=true
 animation/import=true
 animation/fps=15
 animation/filter_script=""

+ 1 - 0
3d/material_testers/rock_albedo.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/rock_ao.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/rock_depth.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/rock_metal.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/rock_rough.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/sand_albedo.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/sand_metal.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/sand_normal.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/sand_rough.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/sand_shine.jpg.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

+ 1 - 0
3d/material_testers/schelde.hdr.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=true
+vector_scale=1.0

BIN
3d/material_testers/tester.scn


+ 1 - 0
3d/material_testers/texture_bricks.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_bricks_depth.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_bricks_metal.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_bricks_normal.jpg.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_cheese_albedo.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_cheese_ao.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_cheese_depth.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_cheese_normal.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_rock_albedo.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_rock_ao.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_rock_depth.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_rock_metal.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_rock_normal.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/texture_wood.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/wool_albedo.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/wool_depth.png.import

@@ -22,3 +22,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0

+ 1 - 0
3d/material_testers/wool_normal.png.import

@@ -21,3 +21,4 @@ process/HDR_as_SRGB=false
 stream=false
 size_limit=0
 detect_3d=false
+vector_scale=1.0