blender/blender-addons
19
43
Fork 96
Code Issues 632 Pull Requests 27 Projects 1 Releases Wiki Activity

io_scene_3ds: Moved specular color texture to specular tint #104918

Merged
Sebastian Sille merged 89 commits from :main into main 2023-09-27 00:42:09 +02:00
Conversation 0 Commits 89 Files Changed 3 +6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90d4f53358 - Show all commits

6
io_scene_3ds/import_3ds.py
View File

@ -754,8 +754,11 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
bitmap_mix.inputs[0].default_value = 0.5 if bitmapnode.image is not None else 1.0 bitmap_mix.inputs[0].default_value = 0.5 if bitmapnode.image is not None else 1.0
bitmapnode.location = (-600, 360) if bitmapnode.image is not None else (-600, 300) bitmapnode.location = (-600, 360) if bitmapnode.image is not None else (-600, 300)
bitmap_mix.location = (-250, 300) bitmap_mix.location = (-250, 300)
gradientnode = next((wn for wn in nodes if wn.type == 'VALTORGB'), False)
links.new(bitmap_mix.outputs['Color'], nodes['Background'].inputs[0]) links.new(bitmap_mix.outputs['Color'], nodes['Background'].inputs[0])
links.new(bitmapnode.outputs['Color'], bitmap_mix.inputs[1]) links.new(bitmapnode.outputs['Color'], bitmap_mix.inputs[1])
if gradientnode:
links.new(bitmapnode.outputs['Color'], gradientnode.inputs[0])
new_chunk.bytes_read += read_str_len new_chunk.bytes_read += read_str_len
# If gradient chunk: # If gradient chunk:
@ -772,10 +775,13 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
gradientnode.location = (-600, 100) gradientnode.location = (-600, 100)
gradientnode.label = "Gradient" gradientnode.label = "Gradient"
backgroundmix = next((wn for wn in worldnodes if wn.type in {'MIX', 'MIX_RGB'}), False) backgroundmix = next((wn for wn in worldnodes if wn.type in {'MIX', 'MIX_RGB'}), False)
bitmapnode = next((wn for wn in nodes if wn.type in {'TEX_IMAGE', 'TEX_ENVIRONMENT'}), False)
if backgroundmix: if backgroundmix:
links.new(gradientnode.outputs['Color'], backgroundmix.inputs[2]) links.new(gradientnode.outputs['Color'], backgroundmix.inputs[2])
else: else:
links.new(gradientnode.outputs['Color'], nodes['Background'].inputs[0]) links.new(gradientnode.outputs['Color'], nodes['Background'].inputs[0])
if bitmapnode:
links.new(bitmapnode.outputs['Color'], gradientnode.inputs[0])
gradientnode.color_ramp.elements.new(read_float(new_chunk)) gradientnode.color_ramp.elements.new(read_float(new_chunk))
read_chunk(file, temp_chunk) read_chunk(file, temp_chunk)
if temp_chunk.ID == COLOR_F: if temp_chunk.ID == COLOR_F: