diff --git a/addon/i3dio/ui/icons/00_PaintedMetal.png b/addon/i3dio/ui/icons/00_PaintedMetal.png index cf84f04..5390527 100755 Binary files a/addon/i3dio/ui/icons/00_PaintedMetal.png and b/addon/i3dio/ui/icons/00_PaintedMetal.png differ diff --git a/addon/i3dio/ui/icons/01_PaintedPlastic.png b/addon/i3dio/ui/icons/01_PaintedPlastic.png index db6b9c7..6087be5 100755 Binary files a/addon/i3dio/ui/icons/01_PaintedPlastic.png and b/addon/i3dio/ui/icons/01_PaintedPlastic.png differ diff --git a/addon/i3dio/ui/icons/02_Chrome.png b/addon/i3dio/ui/icons/02_Chrome.png index dd900b1..889e626 100755 Binary files a/addon/i3dio/ui/icons/02_Chrome.png and b/addon/i3dio/ui/icons/02_Chrome.png differ diff --git a/addon/i3dio/ui/icons/03_Copper.png b/addon/i3dio/ui/icons/03_Copper.png index 264d5ef..e460ce2 100755 Binary files a/addon/i3dio/ui/icons/03_Copper.png and b/addon/i3dio/ui/icons/03_Copper.png differ diff --git a/addon/i3dio/ui/icons/04_GalvanizedMetal.png b/addon/i3dio/ui/icons/04_GalvanizedMetal.png index 34420ed..dd95e2b 100755 Binary files a/addon/i3dio/ui/icons/04_GalvanizedMetal.png and b/addon/i3dio/ui/icons/04_GalvanizedMetal.png differ diff --git a/addon/i3dio/ui/icons/05_Rubber.png b/addon/i3dio/ui/icons/05_Rubber.png index 85c19c6..bd2c04b 100755 Binary files a/addon/i3dio/ui/icons/05_Rubber.png and b/addon/i3dio/ui/icons/05_Rubber.png differ diff --git a/addon/i3dio/ui/icons/06_PaintedMetalOld.png b/addon/i3dio/ui/icons/06_PaintedMetalOld.png index 3a01ae9..fcc6c27 100755 Binary files a/addon/i3dio/ui/icons/06_PaintedMetalOld.png and b/addon/i3dio/ui/icons/06_PaintedMetalOld.png differ diff --git a/addon/i3dio/ui/icons/07_Fabric.png b/addon/i3dio/ui/icons/07_Fabric.png index 7bf5b6a..4748f2c 100755 Binary files a/addon/i3dio/ui/icons/07_Fabric.png and b/addon/i3dio/ui/icons/07_Fabric.png differ diff --git a/addon/i3dio/ui/icons/08_SilverScratched.png b/addon/i3dio/ui/icons/08_SilverScratched.png index 185fee9..1deb5a2 100755 Binary files a/addon/i3dio/ui/icons/08_SilverScratched.png and b/addon/i3dio/ui/icons/08_SilverScratched.png differ diff --git a/addon/i3dio/ui/icons/09_SilverBumpy.png b/addon/i3dio/ui/icons/09_SilverBumpy.png index fee4322..c55d4b6 100755 Binary files a/addon/i3dio/ui/icons/09_SilverBumpy.png and b/addon/i3dio/ui/icons/09_SilverBumpy.png differ diff --git a/addon/i3dio/ui/icons/0_ColorMaterial.png b/addon/i3dio/ui/icons/0_ColorMaterial.png index 4db6971..df0f2c6 100755 Binary files a/addon/i3dio/ui/icons/0_ColorMaterial.png and b/addon/i3dio/ui/icons/0_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/10_Fabric.png b/addon/i3dio/ui/icons/10_Fabric.png index 2b672d4..3c0c763 100755 Binary files a/addon/i3dio/ui/icons/10_Fabric.png and b/addon/i3dio/ui/icons/10_Fabric.png differ diff --git a/addon/i3dio/ui/icons/11_Fabric.png b/addon/i3dio/ui/icons/11_Fabric.png index 0c51c73..53049e9 100755 Binary files a/addon/i3dio/ui/icons/11_Fabric.png and b/addon/i3dio/ui/icons/11_Fabric.png differ diff --git a/addon/i3dio/ui/icons/12_Leather.png b/addon/i3dio/ui/icons/12_Leather.png index 59f1f8b..218932b 100755 Binary files a/addon/i3dio/ui/icons/12_Leather.png and b/addon/i3dio/ui/icons/12_Leather.png differ diff --git a/addon/i3dio/ui/icons/13_Leather.png b/addon/i3dio/ui/icons/13_Leather.png index 3c3da0a..91a7fc5 100755 Binary files a/addon/i3dio/ui/icons/13_Leather.png and b/addon/i3dio/ui/icons/13_Leather.png differ diff --git a/addon/i3dio/ui/icons/14_Wood.png b/addon/i3dio/ui/icons/14_Wood.png index 04a5075..b4cda55 100755 Binary files a/addon/i3dio/ui/icons/14_Wood.png and b/addon/i3dio/ui/icons/14_Wood.png differ diff --git a/addon/i3dio/ui/icons/15_Dirt.png b/addon/i3dio/ui/icons/15_Dirt.png index 247cdb4..04fcb82 100755 Binary files a/addon/i3dio/ui/icons/15_Dirt.png and b/addon/i3dio/ui/icons/15_Dirt.png differ diff --git a/addon/i3dio/ui/icons/16_PaintedMetal.png b/addon/i3dio/ui/icons/16_PaintedMetal.png index c49898d..04fe805 100755 Binary files a/addon/i3dio/ui/icons/16_PaintedMetal.png and b/addon/i3dio/ui/icons/16_PaintedMetal.png differ diff --git a/addon/i3dio/ui/icons/17_PaintedPlastic.png b/addon/i3dio/ui/icons/17_PaintedPlastic.png index 57c3b6e..676bbb9 100755 Binary files a/addon/i3dio/ui/icons/17_PaintedPlastic.png and b/addon/i3dio/ui/icons/17_PaintedPlastic.png differ diff --git a/addon/i3dio/ui/icons/18_SilverRough.png b/addon/i3dio/ui/icons/18_SilverRough.png index f2100b5..e58e0a4 100755 Binary files a/addon/i3dio/ui/icons/18_SilverRough.png and b/addon/i3dio/ui/icons/18_SilverRough.png differ diff --git a/addon/i3dio/ui/icons/19_BrassScratched.png b/addon/i3dio/ui/icons/19_BrassScratched.png index 6cd3815..2fc316c 100755 Binary files a/addon/i3dio/ui/icons/19_BrassScratched.png and b/addon/i3dio/ui/icons/19_BrassScratched.png differ diff --git a/addon/i3dio/ui/icons/1_ColorMaterial.png b/addon/i3dio/ui/icons/1_ColorMaterial.png index cab05f7..6bf44a4 100755 Binary files a/addon/i3dio/ui/icons/1_ColorMaterial.png and b/addon/i3dio/ui/icons/1_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/20_ReflectorWhite.png b/addon/i3dio/ui/icons/20_ReflectorWhite.png index 10f8f96..12ab524 100755 Binary files a/addon/i3dio/ui/icons/20_ReflectorWhite.png and b/addon/i3dio/ui/icons/20_ReflectorWhite.png differ diff --git a/addon/i3dio/ui/icons/21_ReflectorRed.png b/addon/i3dio/ui/icons/21_ReflectorRed.png index 4e23277..f0f9299 100755 Binary files a/addon/i3dio/ui/icons/21_ReflectorRed.png and b/addon/i3dio/ui/icons/21_ReflectorRed.png differ diff --git a/addon/i3dio/ui/icons/22_Reflector_Yellow.png b/addon/i3dio/ui/icons/22_Reflector_Yellow.png index 8b957de..c2745b3 100755 Binary files a/addon/i3dio/ui/icons/22_Reflector_Yellow.png and b/addon/i3dio/ui/icons/22_Reflector_Yellow.png differ diff --git a/addon/i3dio/ui/icons/23_ReflectorDaylight.png b/addon/i3dio/ui/icons/23_ReflectorDaylight.png index 1256ec7..7f0b299 100755 Binary files a/addon/i3dio/ui/icons/23_ReflectorDaylight.png and b/addon/i3dio/ui/icons/23_ReflectorDaylight.png differ diff --git a/addon/i3dio/ui/icons/24_GearShiftStickPlastic.png b/addon/i3dio/ui/icons/24_GearShiftStickPlastic.png index 9e4618a..19ce6d8 100755 Binary files a/addon/i3dio/ui/icons/24_GearShiftStickPlastic.png and b/addon/i3dio/ui/icons/24_GearShiftStickPlastic.png differ diff --git a/addon/i3dio/ui/icons/25_Leather.png b/addon/i3dio/ui/icons/25_Leather.png index 6a4fc00..f48c2e6 100755 Binary files a/addon/i3dio/ui/icons/25_Leather.png and b/addon/i3dio/ui/icons/25_Leather.png differ diff --git a/addon/i3dio/ui/icons/26_PerforatedPlastic.png b/addon/i3dio/ui/icons/26_PerforatedPlastic.png index 5732216..a1889b7 100755 Binary files a/addon/i3dio/ui/icons/26_PerforatedPlastic.png and b/addon/i3dio/ui/icons/26_PerforatedPlastic.png differ diff --git a/addon/i3dio/ui/icons/27_GlassClear.png b/addon/i3dio/ui/icons/27_GlassClear.png index 7af2713..5dfe8ae 100755 Binary files a/addon/i3dio/ui/icons/27_GlassClear.png and b/addon/i3dio/ui/icons/27_GlassClear.png differ diff --git a/addon/i3dio/ui/icons/28_GlassSquare.png b/addon/i3dio/ui/icons/28_GlassSquare.png index 970f072..0b516e1 100755 Binary files a/addon/i3dio/ui/icons/28_GlassSquare.png and b/addon/i3dio/ui/icons/28_GlassSquare.png differ diff --git a/addon/i3dio/ui/icons/29_GlassLine.png b/addon/i3dio/ui/icons/29_GlassLine.png index f4ebc9c..e6d2dfd 100755 Binary files a/addon/i3dio/ui/icons/29_GlassLine.png and b/addon/i3dio/ui/icons/29_GlassLine.png differ diff --git a/addon/i3dio/ui/icons/2_ColorMaterial.png b/addon/i3dio/ui/icons/2_ColorMaterial.png index 277c71c..5a3c49d 100755 Binary files a/addon/i3dio/ui/icons/2_ColorMaterial.png and b/addon/i3dio/ui/icons/2_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/30_Palladium.png b/addon/i3dio/ui/icons/30_Palladium.png index 99165f1..5ca1b04 100755 Binary files a/addon/i3dio/ui/icons/30_Palladium.png and b/addon/i3dio/ui/icons/30_Palladium.png differ diff --git a/addon/i3dio/ui/icons/31_Bronze.png b/addon/i3dio/ui/icons/31_Bronze.png index 79f8090..6522a5d 100755 Binary files a/addon/i3dio/ui/icons/31_Bronze.png and b/addon/i3dio/ui/icons/31_Bronze.png differ diff --git a/addon/i3dio/ui/icons/32_GraphiteBlackPaintedMetal.png b/addon/i3dio/ui/icons/32_GraphiteBlackPaintedMetal.png new file mode 100644 index 0000000..57b809e Binary files /dev/null and b/addon/i3dio/ui/icons/32_GraphiteBlackPaintedMetal.png differ diff --git a/addon/i3dio/ui/icons/33_GraphiteBlackPaintedMetal.png b/addon/i3dio/ui/icons/33_GraphiteBlackPaintedMetal.png deleted file mode 100755 index ca0bc0c..0000000 Binary files a/addon/i3dio/ui/icons/33_GraphiteBlackPaintedMetal.png and /dev/null differ diff --git a/addon/i3dio/ui/icons/33_HalfMetalNoise.png b/addon/i3dio/ui/icons/33_HalfMetalNoise.png index e3ac87a..2f8f003 100755 Binary files a/addon/i3dio/ui/icons/33_HalfMetalNoise.png and b/addon/i3dio/ui/icons/33_HalfMetalNoise.png differ diff --git a/addon/i3dio/ui/icons/34_GrayShinyPlastic.png b/addon/i3dio/ui/icons/34_GrayShinyPlastic.png index 6c0d8be..ed6f5aa 100755 Binary files a/addon/i3dio/ui/icons/34_GrayShinyPlastic.png and b/addon/i3dio/ui/icons/34_GrayShinyPlastic.png differ diff --git a/addon/i3dio/ui/icons/35_Gold.png b/addon/i3dio/ui/icons/35_Gold.png index 60f7a0d..376ecd0 100755 Binary files a/addon/i3dio/ui/icons/35_Gold.png and b/addon/i3dio/ui/icons/35_Gold.png differ diff --git a/addon/i3dio/ui/icons/36_RoughMetalPainted.png b/addon/i3dio/ui/icons/36_RoughMetalPainted.png new file mode 100644 index 0000000..5487948 Binary files /dev/null and b/addon/i3dio/ui/icons/36_RoughMetalPainted.png differ diff --git a/addon/i3dio/ui/icons/36_RoughPaintedMetal.png b/addon/i3dio/ui/icons/36_RoughPaintedMetal.png deleted file mode 100755 index 1e22a0b..0000000 Binary files a/addon/i3dio/ui/icons/36_RoughPaintedMetal.png and /dev/null differ diff --git a/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric.png b/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric.png new file mode 100644 index 0000000..3221733 Binary files /dev/null and b/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric.png differ diff --git a/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric02.png b/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric02.png deleted file mode 100755 index cbd7c20..0000000 Binary files a/addon/i3dio/ui/icons/37_PerforatedSyntheticFabric02.png and /dev/null differ diff --git a/addon/i3dio/ui/icons/38_Fell.png b/addon/i3dio/ui/icons/38_Fell.png index 2db31ab..8d664ba 100755 Binary files a/addon/i3dio/ui/icons/38_Fell.png and b/addon/i3dio/ui/icons/38_Fell.png differ diff --git a/addon/i3dio/ui/icons/39_CorrugatedMetal.png b/addon/i3dio/ui/icons/39_CorrugatedMetal.png deleted file mode 100755 index 307ee1e..0000000 Binary files a/addon/i3dio/ui/icons/39_CorrugatedMetal.png and /dev/null differ diff --git a/addon/i3dio/ui/icons/39_MetalDiamondPlate.png b/addon/i3dio/ui/icons/39_MetalDiamondPlate.png new file mode 100644 index 0000000..7d339ec Binary files /dev/null and b/addon/i3dio/ui/icons/39_MetalDiamondPlate.png differ diff --git a/addon/i3dio/ui/icons/3_ColorMaterial.png b/addon/i3dio/ui/icons/3_ColorMaterial.png index 6c832c9..1263242 100755 Binary files a/addon/i3dio/ui/icons/3_ColorMaterial.png and b/addon/i3dio/ui/icons/3_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/40_ShinyCarPaint.png b/addon/i3dio/ui/icons/40_ShinyCarPaint.png new file mode 100644 index 0000000..9227d51 Binary files /dev/null and b/addon/i3dio/ui/icons/40_ShinyCarPaint.png differ diff --git a/addon/i3dio/ui/icons/41_Fabric.png b/addon/i3dio/ui/icons/41_Fabric.png new file mode 100644 index 0000000..e092255 Binary files /dev/null and b/addon/i3dio/ui/icons/41_Fabric.png differ diff --git a/addon/i3dio/ui/icons/42_Wood.png b/addon/i3dio/ui/icons/42_Wood.png new file mode 100644 index 0000000..2664706 Binary files /dev/null and b/addon/i3dio/ui/icons/42_Wood.png differ diff --git a/addon/i3dio/ui/icons/43_SilverScratchShiny.png b/addon/i3dio/ui/icons/43_SilverScratchShiny.png new file mode 100644 index 0000000..934599d Binary files /dev/null and b/addon/i3dio/ui/icons/43_SilverScratchShiny.png differ diff --git a/addon/i3dio/ui/icons/44_ReflectorYellow.png b/addon/i3dio/ui/icons/44_ReflectorYellow.png new file mode 100644 index 0000000..6ab09e9 Binary files /dev/null and b/addon/i3dio/ui/icons/44_ReflectorYellow.png differ diff --git a/addon/i3dio/ui/icons/45_CircularBrushed.png b/addon/i3dio/ui/icons/45_CircularBrushed.png new file mode 100644 index 0000000..c48e2eb Binary files /dev/null and b/addon/i3dio/ui/icons/45_CircularBrushed.png differ diff --git a/addon/i3dio/ui/icons/46_RubberPatterned.png b/addon/i3dio/ui/icons/46_RubberPatterned.png new file mode 100644 index 0000000..d051838 Binary files /dev/null and b/addon/i3dio/ui/icons/46_RubberPatterned.png differ diff --git a/addon/i3dio/ui/icons/47_GrayPlasticShiny.png b/addon/i3dio/ui/icons/47_GrayPlasticShiny.png new file mode 100644 index 0000000..eac19a4 Binary files /dev/null and b/addon/i3dio/ui/icons/47_GrayPlasticShiny.png differ diff --git a/addon/i3dio/ui/icons/48_ChromeLessShiny.png b/addon/i3dio/ui/icons/48_ChromeLessShiny.png new file mode 100644 index 0000000..004ae40 Binary files /dev/null and b/addon/i3dio/ui/icons/48_ChromeLessShiny.png differ diff --git a/addon/i3dio/ui/icons/49_Fabric.png b/addon/i3dio/ui/icons/49_Fabric.png new file mode 100644 index 0000000..87e4494 Binary files /dev/null and b/addon/i3dio/ui/icons/49_Fabric.png differ diff --git a/addon/i3dio/ui/icons/4_ColorMaterial.png b/addon/i3dio/ui/icons/4_ColorMaterial.png index 1e70a3f..dba4db8 100755 Binary files a/addon/i3dio/ui/icons/4_ColorMaterial.png and b/addon/i3dio/ui/icons/4_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/5_ColorMaterial.png b/addon/i3dio/ui/icons/5_ColorMaterial.png index e7cef9a..df6a896 100755 Binary files a/addon/i3dio/ui/icons/5_ColorMaterial.png and b/addon/i3dio/ui/icons/5_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/6_ColorMaterial.png b/addon/i3dio/ui/icons/6_ColorMaterial.png index 68c0c31..fd1cb1f 100755 Binary files a/addon/i3dio/ui/icons/6_ColorMaterial.png and b/addon/i3dio/ui/icons/6_ColorMaterial.png differ diff --git a/addon/i3dio/ui/icons/7_ColorMaterial.png b/addon/i3dio/ui/icons/7_ColorMaterial.png index 845ca99..21034c8 100755 Binary files a/addon/i3dio/ui/icons/7_ColorMaterial.png and b/addon/i3dio/ui/icons/7_ColorMaterial.png differ diff --git a/addon/i3dio/ui/udim_picker.py b/addon/i3dio/ui/udim_picker.py index 249e3f0..5851381 100755 --- a/addon/i3dio/ui/udim_picker.py +++ b/addon/i3dio/ui/udim_picker.py @@ -21,14 +21,30 @@ # Stored in UDIM index order, starting from top-left corner (Makes it easy to show index order in ui) # Will be valid as long as dictionaries are ordered (Which they are from CPython 3.6 and above) udim_mapping = { - '33_GraphiteBlackPaintedMetal.png': {'name': 'Graphite Black Painted Metal', 'offset': [0, 4]}, + '48_ChromeLessShiny.png': {'name': 'Chrome Less Shiny', 'offset': [0, 6]}, + '49_Fabric.png': {'name': 'Fabric', 'offset': [1, 6]}, + 'PLACEHOLDER1': {'name': 'PLACEHOLDER', 'offset': [2, 6]}, + 'PLACEHOLDER2': {'name': 'PLACEHOLDER', 'offset': [3, 6]}, + 'PLACEHOLDER3': {'name': 'PLACEHOLDER', 'offset': [4, 6]}, + 'PLACEHOLDER4': {'name': 'PLACEHOLDER', 'offset': [5, 6]}, + 'PLACEHOLDER5': {'name': 'PLACEHOLDER', 'offset': [6, 6]}, + 'PLACEHOLDER6': {'name': 'PLACEHOLDER', 'offset': [7, 6]}, + '40_ShinyCarPaint.png': {'name': 'Shiny Car Paint', 'offset': [0, 5]}, + '41_Fabric.png': {'name': 'Fabric', 'offset': [1, 5]}, + '42_Wood.png': {'name': 'Wood', 'offset': [2, 5]}, + '43_SilverScratchShiny.png': {'name': 'Silver Scratched Shiny', 'offset': [3, 5]}, + '44_ReflectorYellow.png': {'name': 'Reflector Yellow', 'offset': [4, 5]}, + '45_CircularBrushed.png': {'name': 'Circular Brushed', 'offset': [5, 5]}, + '46_RubberPatterned.png': {'name': 'Rubber Patterned', 'offset': [6, 5]}, + '47_GrayPlasticShiny.png': {'name': 'Gray Plastic Shiny', 'offset': [7, 5]}, + '32_GraphiteBlackPaintedMetal.png': {'name': 'Graphite Black Painted Metal', 'offset': [0, 5]}, '33_HalfMetalNoise.png': {'name': 'Half Metal Noise', 'offset': [1, 4]}, '34_GrayShinyPlastic.png': {'name': 'Gray Shiny Plastic', 'offset': [2, 4]}, '35_Gold.png': {'name': 'Gold', 'offset': [3, 4]}, - '36_RoughPaintedMetal.png': {'name': 'Rough Painted Metal', 'offset': [4, 4]}, - '37_PerforatedSyntheticFabric02.png': {'name': 'Perforated Synthetic Fabric', 'offset': [5, 4]}, + '36_RoughMetalPainted.png': {'name': 'Rough Painted Metal', 'offset': [4, 4]}, + '37_PerforatedSyntheticFabric.png': {'name': 'Perforated Synthetic Fabric', 'offset': [5, 4]}, '38_Fell.png': {'name': 'Fell', 'offset': [6, 4]}, - '39_CorrugatedMetal.png': {'name': 'Corrugated Metal', 'offset': [7, 4]}, + '39_MetalDiamondPlate.png': {'name': 'Corrugated Metal', 'offset': [7, 4]}, '24_GearShiftStickPlastic.png': {'name': 'Gear Shift Stick Plastic', 'offset': [0, 3]}, '25_Leather.png': {'name': 'Leather', 'offset': [1, 3]}, '26_PerforatedPlastic.png': {'name': 'Perforated Synthetic Fabric', 'offset': [2, 3]}, @@ -285,13 +301,16 @@ def draw(self, context): grid = layout.grid_flow(row_major=True, columns=8, even_columns=True, even_rows=False) for udim_id, udim_item in udim_mapping.items(): - cell = grid.column().box() - cell.alignment = 'CENTER' - cell.label(text=udim_item['name']) - cell.template_icon(icon_value=preview_collections[udim_picker_preview_collection][udim_id].icon_id, scale=3) - o = cell.operator('i3dio.udim_mover', text='Select') - o.uv_offset = udim_item['offset'] - o.mode = 'ABSOLUTE' + if (not udim_item['name'] == 'PLACEHOLDER'): + cell = grid.column().box() + cell.alignment = 'CENTER' + cell.label(text=udim_item['name']) + cell.template_icon(icon_value=preview_collections[udim_picker_preview_collection][udim_id].icon_id, scale=3) + o = cell.operator('i3dio.udim_mover', text='Select') + o.uv_offset = udim_item['offset'] + o.mode = 'ABSOLUTE' + else: + grid.column().label(text='') def execute(self, context): return {'FINISHED'}