From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 29 Aug 2014 16:38:06 +0400
Subject: [PATCH] Revert "Fix new type specs requires OTP-17.0"
This reverts commit 0e64eba1de0214edcaa7abda6ea635e8f0c6f1e7.
diff --git a/src/wings.hrl b/src/wings.hrl
index c7fa9e2..003a0d6 100644
--- a/src/wings.hrl
+++ b/src/wings.hrl
@@ -133,16 +133,16 @@
%% State and records
%% Main state record containing all objects and other important state.
-record(st,
- {shapes=gb_trees:empty() :: gb_trees:tree(),%All visible objects
+ {shapes=gb_trees:empty() :: gb_tree(), %All visible objects
selmode=face :: sel_mode(), %Selection mode.
sh=false :: boolean(), %Smart highlighting active.
sel=[], %Current sel: [{Id,GbSet}]
- ssels=gb_trees:empty() :: gb_trees:tree(), %Saved selections:
+ ssels=gb_trees:empty() :: gb_tree(), %Saved selections:
%% Selection only temporary?
temp_sel=none :: 'none' | {sel_mode(),boolean()},
- mat=gb_trees:empty() :: gb_trees:tree(),%Defined materials (GbTree).
+ mat=gb_trees:empty() :: gb_tree(), %Defined materials (GbTree).
pal=[], %Palette
file, %Current filename.
saved=false :: 'false' | 'true' | 'auto' | integer(),
@@ -154,7 +154,7 @@
edge_loop=none, %Previous edge loop.
views={0,{}}, %{Current,TupleOfViews}
- pst=gb_trees:empty() :: gb_trees:tree(), %Plugin State Info
+ pst=gb_trees:empty() :: gb_tree(), %Plugin State Info
% gb_tree where key is plugin module
%% Previous commands.
@@ -168,7 +168,7 @@
%% Undo information.
last_cmd=empty_scene, %Last command.
- undo=queue:new() :: queue:queue(), %Undo (de)queue.
+ undo=queue:new() :: queue(), %Undo (de)queue.
next_is_undo=true :: boolean(), %State of undo/redo toggle.
undone=[] :: list() %States that were undone.
}).
@@ -185,14 +185,14 @@
% The GbSet contains the
% object's selection.
name="" :: string() | tuple(), %Name. (AutoUV stores other things here.)
- es=array:new() :: array:array(), %array containing edges
- lv=none :: 'none' | array:array(), %Left vertex attributes
- rv=none :: 'none' | array:array(), %Right vertex attributes,
- fs :: gb_trees:tree(), %Faces
- he=gb_sets:empty() :: gb_sets:set(), %Hard edges
- vc :: array:array(), %Connection info (=incident edge)
+ es=array:new() :: array(), %array containing edges
+ lv=none :: 'none' | array(), %Left vertex attributes
+ rv=none :: 'none' | array(), %Right vertex attributes,
+ fs :: gb_tree(), %Faces
+ he=gb_sets:empty() :: gb_set(), %Hard edges
+ vc :: array(), %Connection info (=incident edge)
% for vertices.
- vp=array:new() :: array:array(), %Vertex positions.
+ vp=array:new() :: array(), %Vertex positions.
pst=gb_trees:empty(), %Plugin State Info,
% gb_tree where key is plugin module
mat=default, %Materials.
diff --git a/src/wings_sel.erl b/src/wings_sel.erl
index 0038d9e..1fb46de 100644
--- a/src/wings_sel.erl
+++ b/src/wings_sel.erl
@@ -122,7 +122,7 @@ mapfold_1(_F, Acc, [], Shs, _St, ShsAcc) ->
-type filter_fun() :: fun((visible_face_num() | edge_num() | vertex_num() | 0,
#we{}) -> boolean()).
-spec make(filter_fun(), sel_mode(), #st{}) ->
- #st{sel::[{non_neg_integer(),gb_sets:set()}]}.
+ #st{sel::[{non_neg_integer(),gb_set()}]}.
make(Filter, Mode, #st{shapes=Shapes}=St) when is_function(Filter, 2) ->
Sel0 = gb_trees:values(Shapes),
diff --git a/src/wings_undo.erl b/src/wings_undo.erl
index 58df968..b6a8d4a 100644
--- a/src/wings_undo.erl
+++ b/src/wings_undo.erl
@@ -30,12 +30,12 @@
%% The essential part of the state record.
-record(est,
- {shapes=[] :: list(#we{}) | gb_trees:tree(),
+ {shapes=[] :: list(#we{}) | gb_tree(),
selmode=face :: sel_mode(),
sel=[] :: list(),
onext=1 :: elem_num(),
mat=wings_material:default(),
- pst=gb_trees:empty() :: gb_trees:tree(),
+ pst=gb_trees:empty() :: gb_tree(),
%% For the Develop menu.
cmd,