View | Details | Raw Unified | Return to bug 201115
Collapse All | Expand All

(-)files/patch-src_array.erl (+11 lines)
Line 0 Link Here
1
--- src/array.erl.orig	2015-06-24 22:14:48 UTC
2
+++ src/array.erl
3
@@ -155,7 +155,7 @@
4
 %% structure and the types of its fields.  So, please make sure that any
5
 %% changes to its structure are also propagated to erl_types.erl.
6
 %%
7
-%% -opaque array() :: #array{}.
8
+-opaque array() :: #array{}.
9
 
10
 %%
11
 %% Types
(-)files/patch-src_wings.hrl (+62 lines)
Line 0 Link Here
1
--- src/wings.hrl.orig	2015-06-24 22:08:57 UTC
2
+++ src/wings.hrl
3
@@ -113,16 +113,16 @@
4
 %% State and records
5
 %% Main state record containing all objects and other important state.
6
 -record(st,
7
-	{shapes=gb_trees:empty() :: gb_tree(),	%All visible objects
8
+	{shapes=gb_trees:empty() :: gb_trees:tree(),	%All visible objects
9
 	 selmode=face :: sel_mode(),		%Selection mode.
10
 	 sh=false :: boolean(),			%Smart highlighting active.
11
 	 sel=[],				%Current sel: [{Id,GbSet}]
12
-	 ssels=gb_trees:empty() :: gb_tree(),   %Saved selections:
13
+	 ssels=gb_trees:empty() :: gb_trees:tree(),   %Saved selections:
14
 
15
 	 %% Selection only temporary?
16
 	 temp_sel=none :: 'none' | {sel_mode(),boolean()},
17
 
18
-	 mat=gb_trees:empty() :: gb_tree(),	%Defined materials (GbTree).
19
+	 mat=gb_trees:empty() :: gb_trees:tree(),	%Defined materials (GbTree).
20
 	 pal=[],                                %Palette
21
 	 file,					%Current filename.
22
 	 saved=false :: 'false'  | 'true' | 'auto' | integer(),
23
@@ -134,7 +134,7 @@
24
 
25
 	 edge_loop=none,			%Previous edge loop.
26
 	 views={0,{}},				%{Current,TupleOfViews}
27
-	 pst=gb_trees:empty() :: gb_tree(),     %Plugin State Info
28
+	 pst=gb_trees:empty() :: gb_trees:tree(),     %Plugin State Info
29
 						%   gb_tree where key is plugin	module 
30
 
31
 	 %% Previous commands.
32
@@ -148,7 +148,7 @@
33
 
34
 	 %% Undo information.
35
 	 last_cmd=empty_scene,		        %Last command.
36
-	 undo=queue:new() :: queue(),		%Undo (de)queue.
37
+	 undo=queue:new() :: queue:queue(),	%Undo (de)queue.
38
 	 next_is_undo=true :: boolean(),	%State of undo/redo toggle.
39
 	 undone=[] :: list()		        %States that were undone.
40
 	}).
41
@@ -165,14 +165,14 @@
42
 						%  The GbSet contains the
43
 						%  object's selection.
44
 	 name="" :: string() | tuple(),		%Name. (AutoUV stores other things here.)
45
-	 es=array:new() :: array(),		%array containing edges
46
-	 lv=none :: 'none' | array(),	        %Left vertex attributes
47
-	 rv=none :: 'none' | array(),	        %Right vertex attributes,
48
-	 fs :: gb_tree(),		        %Faces
49
-	 he=gb_sets:empty() :: gb_set(),	%Hard edges
50
-	 vc :: array(),		                %Connection info (=incident edge)
51
+	 es=array:new() :: array:array(),		%array containing edges
52
+	 lv=none :: 'none' | array:array(),	        %Left vertex attributes
53
+	 rv=none :: 'none' | array:array(),	        %Right vertex attributes,
54
+	 fs :: gb_trees:tree(),		        %Faces
55
+	 he=gb_sets:empty() :: gb_sets:set(),	%Hard edges
56
+	 vc :: array:array(),		                %Connection info (=incident edge)
57
 						% for vertices.
58
-	 vp=array:new() :: array(),		%Vertex positions.
59
+	 vp=array:new() :: array:array(),		%Vertex positions.
60
 	 pst=gb_trees:empty(),                  %Plugin State Info, 
61
 						%   gb_tree where key is plugin module
62
 	 mat=default,				%Materials.
(-)files/patch-src_wings__menu.erl (+11 lines)
Line 0 Link Here
1
--- src/wings_menu.erl.orig	2015-06-24 22:22:23 UTC
2
+++ src/wings_menu.erl
3
@@ -43,7 +43,7 @@
4
 	 sel=none :: 'none'|pos_integer(),	%Selected item (1..tuple_size(Menu))
5
 	 sel_side=left :: 'left'|'right',	%Selection on left or right.
6
 	 ns=[],					%Name stack.
7
-	 menu :: tuple(menu_item()),		%Normalized menu.
8
+	 menu,					%Normalized menu.
9
 	 timer=make_ref(),			%Active submenu timer.
10
 	 level=?INITIAL_LEVEL,			%Menu level.
11
 	 type :: 'plain'|'popup',	        %Type of menu.
(-)files/patch-src_wings__sel.erl (+11 lines)
Line 0 Link Here
1
--- src/wings_sel.erl.orig	2015-06-24 22:25:49 UTC
2
+++ src/wings_sel.erl
3
@@ -122,7 +122,7 @@ mapfold_1(_F, Acc, [], Shs, _St, ShsAcc)
4
 -type filter_fun() :: fun((visible_face_num() | edge_num() | vertex_num() | 0,
5
 			   #we{}) -> boolean()).
6
 -spec make(filter_fun(), sel_mode(), #st{}) ->
7
-    #st{sel::[{non_neg_integer(),gb_set()}]}.
8
+    #st{sel::[{non_neg_integer(),gb_sets:set()}]}.
9
 
10
 make(Filter, Mode, #st{shapes=Shapes}=St) when is_function(Filter, 2) ->
11
     Sel0 = gb_trees:values(Shapes),
(-)files/patch-src_wings__undo.erl (+17 lines)
Line 0 Link Here
1
--- src/wings_undo.erl.orig	2015-06-24 22:27:33 UTC
2
+++ src/wings_undo.erl
3
@@ -30,12 +30,12 @@
4
 	 
5
 %% The essential part of the state record.
6
 -record(est,
7
-	{shapes=[] :: list(#we{}) | gb_tree(),
8
+	{shapes=[] :: list(#we{}) | gb_trees:tree(),
9
 	 selmode=face :: sel_mode(),
10
 	 sel=[] :: list(),
11
 	 onext=1 :: elem_num(),
12
 	 mat=wings_material:default(),
13
-	 pst=gb_trees:empty() :: gb_tree(),
14
+	 pst=gb_trees:empty() :: gb_trees:tree(),
15
 
16
 	 %% For the Develop menu.
17
 	 cmd,

Return to bug 201115