wings_convert script didn't work

dgud · Apr 15, 2014 · 600fb8a · 600fb8a
1 parent 9f09ac3
commit 600fb8a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 40 deletions.
diff --git a/plugins_src/accel/wpc_pick.erl b/plugins_src/accel/wpc_pick.erl
@@ -47,23 +47,27 @@
 -define(FL, 32/native-float).
 
 init() ->
-    Dir = filename:dirname(code:which(?MODULE)),
-    Name = "wings_pick_drv",
-    case erl_ddll:load_driver(Dir, Name) of
-	ok -> ok;
-	{error,Reason} ->
-	    io:format("Failed to load ~s in ~s\n~s\n",
-		      [Name,Dir,erl_ddll:format_error(Reason)]),
-	    erlang:halt()
-    end,
-    try
-	Port = open_port({spawn_driver,Name}, [binary]),
-	register(wings_pick_port, Port)
-    catch error:_ ->
-	io:format("Failed to open port ~s.\n", [Name]),
-	erlang:halt()
+    case get(wings_not_running) of
+	undefined ->
+	    Dir = filename:dirname(code:which(?MODULE)),
+	    Name = "wings_pick_drv",
+	    case erl_ddll:load_driver(Dir, Name) of
+		ok -> ok;
+		{error,Reason} ->
+		    io:format("Failed to load ~s in ~s\n~s\n",
+			      [Name,Dir,erl_ddll:format_error(Reason)]),
+		    erlang:halt()
+	    end,
+	    try
+		Port = open_port({spawn_driver,Name}, [binary]),
+		register(wings_pick_port, Port)
+	    catch error:_ ->
+		    io:format("Failed to open port ~s.\n", [Name]),
+		    erlang:halt()
+	    end;
+	_ ->
+	    ignore
     end,
-
     false.
 
 %% pick_matrix(X, Y, Xs, Ys, ViewPort) -> PickMatrix

diff --git a/plugins_src/accel/wpc_pnoise.erl b/plugins_src/accel/wpc_pnoise.erl
@@ -17,6 +17,9 @@
 -export([init/0]).
 
 init() ->
-    pnoise:start(),
+    case get(wings_not_running) of
+	undefined -> pnoise:start();
+	_ -> ignore
+    end,
     false.
 
diff --git a/src/wings_convert b/src/wings_convert
@@ -75,6 +75,7 @@ strip_path("crs/"  ++ Path) -> lists:reverse(Path);
 strip_path(Path)            -> lists:reverse(Path).    
 
 convert(Fs, Opts) ->
+    put(wings_not_running, {import, Fs}),
     wings_pref:init(),   %% Preference ets table is needed
     wings_file:init(),   %% more preferences
     wings_image:init(wings_not_running), %% Needed for image export
@@ -203,7 +204,6 @@ get_module(_, []) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 import_file(File, Opts) ->
-    put(wings_not_running, {import, File}),
     verbose("~s => ", [File], Opts#opts.verbose),
     try import_file_1(File,Opts) of	
 	{error,Reason} ->

diff --git a/src/wings_view.erl b/src/wings_view.erl
@@ -1388,15 +1388,20 @@ one_of(false,_, S) -> S.
 
 export_views(#st{views={_,Views0}}) ->
     Views1 = tuple_to_list(Views0),
-    CurrentView = current(),
-    Views = case get_view_index(CurrentView,Views1) of
-        undefined ->
-            [{CurrentView,"current_view"}]++Views1;
-        Idx ->
-            View = element(Idx,Views0),
-            Views2 = Views1 -- [View],  % tuple index starts from 1 and lists from 0
-            [View]++Views2
-    end,
+    Views = case get(wings_not_running) of
+		undefined ->
+		    CurrentView = current(),
+		    case get_view_index(CurrentView,Views1) of
+			undefined ->
+			    [{CurrentView,"current_view"}]++Views1;
+			Idx ->
+			    View = element(Idx,Views0),
+			    Views2 = Views1 -- [View],  % tuple index starts from 1 and lists from 0
+			    [View]++Views2
+		    end;
+		_ ->
+		    Views1
+	    end,
     export_views_1(Views).
 
 export_views_1([{View,Name}|Views]) ->
@@ -1408,19 +1413,19 @@ export_views_1([]) -> [].
 import_views(Views, #st{views={CurrentView0,{}}}=St) -> % loading a project
     NewViews0 = import_views_1(Views),
     NewViews = case NewViews0 of
-        [] ->
-            reset(),
-            CurrentView = CurrentView0,
-            NewViews0;
-        _ ->
-            {{View,_},NewViews1} = remove_cur_view(NewViews0),
-            set_current(View),
-            CurrentView = case get_view_index(View,NewViews1) of
-                undefined -> CurrentView0;
-                Idx -> Idx
-            end,
-            NewViews1
-    end,
+		   [] ->
+		       reset(),
+		       CurrentView = CurrentView0,
+		       NewViews0;
+		   _ ->
+		       {{View,_},NewViews1} = remove_cur_view(NewViews0),
+		       (get(wings_not_running) == undefined) andalso set_current(View),
+		       CurrentView = case get_view_index(View,NewViews1) of
+					 undefined -> CurrentView0;
+					 Idx -> Idx
+				     end,
+		       NewViews1
+	       end,
     St#st{views={CurrentView,list_to_tuple(NewViews)}};
 import_views(Views, #st{views={CurrentView,OldViews}}=St) -> % merging a project
     NewViews0 = import_views_1(Views),