[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32302] trunk/blender: revert r32284, turns out OpenSuse needs this for forkpty(), also fixed missing import with 3ds export.

[Campbell Barton]

Revision: 32302
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32302
Author:   campbellbarton
Date:     2010-10-04 13:42:39 +0200 (Mon, 04 Oct 2010)

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

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-10-04 10:15:17 UTC (rev 32301)
+++ trunk/blender/CMakeLists.txt	2010-10-04 11:42:39 UTC (rev 32302)
@@ -297,7 +297,8 @@
 
 	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

Modified: trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py	2010-10-04 10:15:17 UTC (rev 32301)
+++ trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py	2010-10-04 11:42:39 UTC (rev 32302)
@@ -431,6 +431,7 @@
     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)))