Skip to content

Commit ac66036

Browse files
committed
Revert "Improved texture optimization"
This reverts commit c2b5fa3.
1 parent c2b5fa3 commit ac66036

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

Utils/SFR_TextureOptimizer.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,8 @@ def draw(self,context):
2525
layout.separator()
2626
layout.label(text = "To proceed with the optimization, press [OK]")
2727

28-
2928
def execute(self, context: Context):
3029

31-
def do_resize(settings, path, setting, prop):
32-
if setting > 0:
33-
currVal = 0
34-
for iFiles in os.listdir(path):
35-
currVal = 0
36-
for eachName in prop:
37-
if os.path.isfile(nc(os.path.join(path,iFiles))) and prop[currVal] in nc(iFiles):
38-
resize_image(iFiles, setting, path)
39-
currVal += 1
40-
4130
#put all images into one folder
4231
bpy.ops.file.pack_all()
4332
bpy.ops.file.unpack_all(method="USE_LOCAL")
@@ -57,7 +46,6 @@ def do_resize(settings, path, setting, prop):
5746
Normal = ["normal","norm","nor","nrm","bump","bmp","height"]
5847
Translucency = ["translucency","transmission","translucent"]
5948

60-
<<<<<<< Updated upstream
6149
#make skimage not give warning
6250
import imageio.core.util
6351
def ignore_warnings(*args, **kwargs):
@@ -122,14 +110,6 @@ def add_to_seen(file, type):
122110
continue
123111
resize_image(file, settings.translucency_resize, path)
124112

125-
=======
126-
print("TEXTURE OPTIMIZATION: INNITIALIZED")
127-
128-
do_resize(settings, path, settings.diffuse_resize, Diffuse)
129-
do_resize(settings, path, settings.specular_resize, Specular)
130-
do_resize(settings, path, settings.roughness_resize, Roughness)
131-
132-
>>>>>>> Stashed changes
133113
print("TEXTURE OPTIMIZATION: COMPLETED")
134114

135115
return {'FINISHED'}

0 commit comments

Comments
 (0)