Skip to content
Snippets Groups Projects
Commit e568ea66 authored by Campbell Barton's avatar Campbell Barton
Browse files

revert r32284, turns out OpenSuse needs this for forkpty(), also fixed...

 revert r32284, turns out OpenSuse needs this for forkpty(), also fixed missing import with 3ds export.
parent a6d62bf0
No related branches found
No related tags found
No related merge requests found
...@@ -297,7 +297,8 @@ IF(UNIX AND NOT APPLE) ...@@ -297,7 +297,8 @@ IF(UNIX AND NOT APPLE)
FIND_PACKAGE(X11 REQUIRED) FIND_PACKAGE(X11 REQUIRED)
SET(LLIBS "-lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}") # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so # BSD's dont use libdl.so
......
...@@ -431,6 +431,7 @@ def make_material_texture_chunk(id, images): ...@@ -431,6 +431,7 @@ def make_material_texture_chunk(id, images):
mat_sub = _3ds_chunk(id) mat_sub = _3ds_chunk(id)
def add_image(img): def add_image(img):
import os
filename = os.path.basename(image.filepath) filename = os.path.basename(image.filepath)
mat_sub_file = _3ds_chunk(MATMAPFILE) mat_sub_file = _3ds_chunk(MATMAPFILE)
mat_sub_file.add_variable("mapfile", _3ds_string(sane_name(filename))) mat_sub_file.add_variable("mapfile", _3ds_string(sane_name(filename)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment