diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-04 15:42:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-04 15:42:39 +0400 |
| commit | e568ea668e80578d6f98feb7ab16a0916220a248 (patch) | |
| tree | 541a0d881f620f6ec0add34b7c2cf9a515424f5d | |
| parent | a6d62bf0db09ae2759fd45abb3af563fefc13690 (diff) | |
revert r32284, turns out OpenSuse needs this for forkpty(), also fixed missing import with 3ds export.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | release/scripts/op/io_scene_3ds/export_3ds.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 63cade84647..f527f9d410c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,7 +297,8 @@ IF(UNIX AND NOT APPLE) 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") # BSD's dont use libdl.so diff --git a/release/scripts/op/io_scene_3ds/export_3ds.py b/release/scripts/op/io_scene_3ds/export_3ds.py index 0cbb4347dda..943c94af55f 100644 --- a/release/scripts/op/io_scene_3ds/export_3ds.py +++ b/release/scripts/op/io_scene_3ds/export_3ds.py @@ -431,6 +431,7 @@ def make_material_texture_chunk(id, images): mat_sub = _3ds_chunk(id) def add_image(img): + import os filename = os.path.basename(image.filepath) mat_sub_file = _3ds_chunk(MATMAPFILE) mat_sub_file.add_variable("mapfile", _3ds_string(sane_name(filename))) |