Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revert r32284, turns out OpenSuse needs this for forkpty(), also fixed missing import with 3ds export.

Browse Source
This commit is contained in:
Campbell Barton
2010-10-04 11:42:39 +00:00
parent a6d62bf0db
commit e568ea668e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -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

1
release/scripts/op/io_scene_3ds/export_3ds.py
View File

@@ -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)))