Pose Library: Update to use the asset shelf (when enabled) #104546

Merged
Julian Eisel merged 33 commits from asset-shelf into main 2023-08-04 15:00:21 +02:00
3 changed files with 3 additions and 10 deletions
Showing only changes of commit b56f0f227f - Show all commits

View File

@ -586,13 +586,10 @@ def make_material_texture_chunk(chunk_id, texslots, pct):
either 0x100 or 0x200, tintcolor will be processed if colorchunks are present""" either 0x100 or 0x200, tintcolor will be processed if colorchunks are present"""
mapflags = 0 mapflags = 0
if texslot.extension == 'EXTEND': if texslot.extension == 'EXTEND':
mapflags |= 0x1 mapflags |= 0x1
if texslot.extension == 'MIRROR': if texslot.extension == 'MIRROR':
mapflags |= 0x2 mapflags |= 0x2
if texslot.extension == 'CLIP': if texslot.extension == 'CLIP':
mapflags |= 0x10 mapflags |= 0x10

View File

@ -2,10 +2,10 @@
# Copyright 2005 Bob Holcomb # Copyright 2005 Bob Holcomb
import os import os
import time
import struct
import bpy import bpy
import time
import math import math
import struct
import mathutils import mathutils
from bpy_extras.image_utils import load_image from bpy_extras.image_utils import load_image
from bpy_extras.node_shader_utils import PrincipledBSDFWrapper from bpy_extras.node_shader_utils import PrincipledBSDFWrapper
@ -293,13 +293,9 @@ def add_texture_to_material(image, contextWrapper, pct, extend, alpha, scale, of
img_wrap.rotation[2] = angle img_wrap.rotation[2] = angle
if extend == 'mirror': if extend == 'mirror':
# 3DS mirror flag can be emulated by these settings (at least so it seems)
img_wrap.extension = 'MIRROR' img_wrap.extension = 'MIRROR'
elif extend == 'decal': elif extend == 'decal':
# 3DS' decal mode maps best to Blenders EXTEND
img_wrap.extension = 'EXTEND' img_wrap.extension = 'EXTEND'
elif extend == 'noWrap': elif extend == 'noWrap':
img_wrap.extension = 'CLIP' img_wrap.extension = 'CLIP'

View File

@ -4,7 +4,7 @@
bl_info = { bl_info = {
'name': 'glTF 2.0 format', 'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', 'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (3, 6, 18), "version": (4, 0, 0),
'blender': (3, 5, 0), 'blender': (3, 5, 0),
'location': 'File > Import-Export', 'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0', 'description': 'Import-Export as glTF 2.0',