blender/blender-addons-contrib
Archived
3
11
Fork 17
Code Pull Requests 3 Activity

Make sure there is a primary texture #8

Merged
Sebastian Sille merged 1 commits from nrgsille-patch-1 into blender-v3.3-release 2023-02-20 15:32:23 +01:00
Conversation 0 Commits 1 Files Changed 1 +8 -3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ac24cbda8 - Show all commits

11
io_scene_3ds/export_3ds.py
View File

@ -673,12 +673,15 @@ def make_material_chunk(material, image):
material_chunk.add_subchunk(make_percent_subchunk(MATSELFILPCT, wrap.emission_strength)) material_chunk.add_subchunk(make_percent_subchunk(MATSELFILPCT, wrap.emission_strength))
material_chunk.add_subchunk(shading) material_chunk.add_subchunk(shading)
primary_tex = False
if wrap.base_color_texture: if wrap.base_color_texture:
d_pct = 0.7 + sum(wrap.base_color[:]) * 0.1 d_pct = 0.7 + sum(wrap.base_color[:]) * 0.1
color = [wrap.base_color_texture] color = [wrap.base_color_texture]
matmap = make_material_texture_chunk(MAT_DIFFUSEMAP, color, d_pct) matmap = make_material_texture_chunk(MAT_DIFFUSEMAP, color, d_pct)
if matmap: if matmap:
material_chunk.add_subchunk(matmap) material_chunk.add_subchunk(matmap)
primary_tex = True
if wrap.specular_texture: if wrap.specular_texture:
spec = [wrap.specular_texture] spec = [wrap.specular_texture]
@ -703,8 +706,7 @@ def make_material_chunk(material, image):
if wrap.normalmap_texture: if wrap.normalmap_texture:
normal = [wrap.normalmap_texture] normal = [wrap.normalmap_texture]
bump = wrap.normalmap_strength b_pct = wrap.normalmap_strength
b_pct = min(bump, 1)
matmap = make_material_texture_chunk(MAT_BUMPMAP, normal, b_pct) matmap = make_material_texture_chunk(MAT_BUMPMAP, normal, b_pct)
if matmap: if matmap:
material_chunk.add_subchunk(matmap) material_chunk.add_subchunk(matmap)
@ -733,7 +735,10 @@ def make_material_chunk(material, image):
diffuse = [link.from_node.image] if not wrap.normalmap_texture else None diffuse = [link.from_node.image] if not wrap.normalmap_texture else None
if diffuse: if diffuse:
matmap = make_texture_chunk(MAT_TEX2MAP, diffuse) if primary_tex == False:
matmap = make_texture_chunk(MAT_DIFFUSEMAP, diffuse)
else:
matmap = make_texture_chunk(MAT_TEX2MAP, diffuse)
if matmap: if matmap:
material_chunk.add_subchunk(matmap) material_chunk.add_subchunk(matmap)