Attachment #177028 for bug #213938

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




# $FreeBSD$

PORTNAME=	wings
PORTVERSION=	1.5.4
PORTREVISION=	6
CATEGORIES=	graphics
MASTER_SITES=	SF
DIST_SUBDIR=	erlang

LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS=	erl:lang/erlang \
		erlang-esdl>0:devel/erlang-esdl \
		erlang-cl>0:devel/erlang-cl
RUN_DEPENDS:=	${BUILD_DEPENDS}

MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
PLIST_SUB=	VERSION="${PORTVERSION}"
MAKE_JOBS_UNSAFE=yes
USE_GL=		gl glu

SUB_FILES=	${PORTNAME}.sh


post-patch:
	@${REINPLACE_CMD} -e 's|$$(GCC)|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib|g' \
		${WRKSRC}/plugins_src/accel/Makefile
	@${REINPLACE_CMD} -e 's|random:|rand:|' \
		${WRKSRC}/src/wings_deform.erl \
		${WRKSRC}/src/wings_sel_cmd.erl \
		${WRKSRC}/e3d/e3d_util.erl \
		${WRKSRC}/plugins_src/autouv/auv_mapping.erl
	@${FIND} ${WRKSRC} -name "*.orig" -delete

do-install:

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (erlang/wings-1.4.1.tar.bz2) = 51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a	1	TIMESTAMP = 1479231639
2	SIZE (erlang/wings-1.4.1.tar.bz2) = 3904369	2	SHA256 (erlang/wings-1.5.4.tar.bz2) = bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663
		3	SIZE (erlang/wings-1.5.4.tar.bz2) = 6213585




--- e3d/e3d_qbvh.erl.orig	2015-08-06 10:38:19 UTC
+++ e3d/e3d_qbvh.erl
@@ -40,6 +40,7 @@
 
 -define(F32, 32/float-native).
 -define(I32, 32/signed-native).
+-define(U32, 32/unsigned-native).
 -define(QNODE_SZ, ((24+4)*4)).
 -define(QTRI_SZ,  ((12*3+4)*4)).
 
@@ -118,8 +119,8 @@ convert_to_image(W, <<BBs:(24*4)/binary,
 convert_to_image(_, <<>>, Acc) -> Acc.
 
 convert_children(4, _W, Qns, Acc) ->  {Qns, Acc};
-convert_children(J, W, <<16#ffffffff:?I32, Qns/binary>>, Acc) ->  %% EMPTY
-    convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?I32>>);
+convert_children(J, W, <<16#ffffffff:?U32, Qns/binary>>, Acc) ->  %% EMPTY
+    convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?U32>>);
 convert_children(J, W, <<C0:?I32, Qns/binary>>, Acc) when C0 < 0 -> %% IS_LEAF
     Count = first_quad(C0) * 10,
     X = (Count rem W) div 10, %% "div 10" in order to not waste bits




--- plugins_src/accel/perlin_noise_drv.c.orig
+++ plugins_src/accel/perlin_noise_drv.c
@@ -22,6 +22,11 @@
 #include <math.h>
 #include <string.h>
 
+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
+typedef int ErlDrvSizeT;
+typedef int ErlDrvSSizeT;
+#endif
+
 #define PNOISE3 3
 #define SNOISE1 4
 #define SNOISE2 5
@@ -57,9 +62,9 @@
  */
 static ErlDrvData perlin_noise_start(ErlDrvPort port, char *buff);
 static void perlin_noise_stop(ErlDrvData handle);
-static int control(ErlDrvData handle, unsigned int command, 
-                   char* buff, int count, 
-                   char** res, int res_size);
+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, 
+                   char* buff, ErlDrvSizeT count, 
+                   char** res, ErlDrvSizeT res_size);
 
 /*
  * Internal routines
@@ -82,7 +87,18 @@
    NULL,                  /* void * that is not used (BC) */
    control,               /* F_PTR control, port_control callback */
    NULL,                  /* F_PTR timeout, driver_set_timer callback */
-   NULL                   /* F_PTR outputv, reserved */
+   NULL,                  /* F_PTR outputv, reserved */
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   ERL_DRV_EXTENDED_MARKER,
+   ERL_DRV_EXTENDED_MAJOR_VERSION,
+   ERL_DRV_EXTENDED_MINOR_VERSION,
+   0,
+   NULL,
+   NULL,
+   NULL
 };
 
 /*
@@ -114,9 +130,9 @@
    
 }
 
-static int control(ErlDrvData handle, unsigned int command,
-		   char* buff, int count, 
-		   char** res, int res_size)
+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
+		   char* buff, ErlDrvSizeT count, 
+		   char** res, ErlDrvSizeT res_size)
 {
    ErlDrvBinary* bin;
 




--- plugins_src/accel/wings_pick_drv.c.orig
+++ plugins_src/accel/wings_pick_drv.c
@@ -20,14 +20,19 @@
 #endif
 #include <string.h>
 
+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
+typedef int ErlDrvSizeT;
+typedef int ErlDrvSSizeT;
+#endif
+
 /*
  * Interface routines.
  */
 static ErlDrvData wings_file_start(ErlDrvPort port, char *buff);
 static void wings_file_stop(ErlDrvData handle);
-static int control(ErlDrvData handle, unsigned int command,
-                   char* buff, int count,
-                   char** res, int res_size);
+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
+                   char* buff, ErlDrvSizeT count,
+                   char** res, ErlDrvSizeT res_size);
 static void outputv(ErlDrvData drv_data, ErlIOVec* ev);
 
 /*
@@ -47,7 +52,18 @@
     NULL,                  /* void * that is not used (BC) */
     control,               /* F_PTR control, port_control callback */
     NULL,                  /* F_PTR timeout, driver_set_timer callback */
-    outputv                /* F_PTR outputv, reserved */
+    outputv,                /* F_PTR outputv, reserved */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0,
+    NULL,
+    NULL,
+    NULL
 };
 
 struct vertex_struct {
@@ -107,14 +123,14 @@
  * Handle commands.
  */
 
-static int
+static ErlDrvSSizeT
 control(ErlDrvData handle, unsigned int command,
-        char* buf, int count,
-        char** res, int res_size)
+        char* buf, ErlDrvSizeT count,
+        char** res, ErlDrvSizeT res_size)
 {
   switch (command) {
   case 0: {			/* Define matrix */
-    memcpy((void *) m, (void *) buf, count);
+    memcpy((void *) m, (void *) buf, (size_t) count);
 #if 0
     {
       int i, j;

Line 0 Link Here

(-)files/patch-plugins__src_import_export_wpc_lwo.erl (+11 lines)
	1	--- plugins_src/import_export/wpc_lwo.erl.orig 2015-08-06 10:38:19 UTC
	2	+++ plugins_src/import_export/wpc_lwo.erl
	3	@@ -13,7 +13,7 @@
	4
	5	-module(wpc_lwo).
	6	-export([init/0, menu/2, command/2, export/1]).
	7	--include_lib("wings/e3d/e3d.hrl").
	8	+-include_lib("e3d.hrl").
	9
	10	init() ->
	11	true.

Lines 1-11 Link Here

(-)files/patch-src_array.erl (-11 lines)
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




--- src/wings.hrl.orig	2015-06-24 22:08:57 UTC
+++ src/wings.hrl
@@ -113,16 +113,16 @@
 %% State and records
 %% Main state record containing all objects and other important state.
 -record(st,
-	{shapes=gb_trees:empty() :: gb_tree(),	%All visible objects
+	{shapes=gb_trees:empty() :: gb_trees: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_tree(),   %Saved selections:
+	 ssels=gb_trees:empty() :: gb_trees:tree(),   %Saved selections:
 
 	 %% Selection only temporary?
 	 temp_sel=none :: 'none' | {sel_mode(),boolean()},
 
-	 mat=gb_trees:empty() :: gb_tree(),	%Defined materials (GbTree).
+	 mat=gb_trees:empty() :: gb_trees:tree(),	%Defined materials (GbTree).
 	 pal=[],                                %Palette
 	 file,					%Current filename.
 	 saved=false :: 'false'  | 'true' | 'auto' | integer(),
@@ -134,7 +134,7 @@
 
 	 edge_loop=none,			%Previous edge loop.
 	 views={0,{}},				%{Current,TupleOfViews}
-	 pst=gb_trees:empty() :: gb_tree(),     %Plugin State Info
+	 pst=gb_trees:empty() :: gb_trees:tree(),     %Plugin State Info
 						%   gb_tree where key is plugin	module 
 
 	 %% Previous commands.
@@ -148,7 +148,7 @@
 
 	 %% Undo information.
 	 last_cmd=empty_scene,		        %Last command.
-	 undo=queue:new() :: queue(),		%Undo (de)queue.
+	 undo=queue:new() :: queue:queue(),	%Undo (de)queue.
 	 next_is_undo=true :: boolean(),	%State of undo/redo toggle.
 	 undone=[] :: list()		        %States that were undone.
 	}).
@@ -165,14 +165,14 @@
 						%  The GbSet contains the
 						%  object's selection.
 	 name="" :: string() | tuple(),		%Name. (AutoUV stores other things here.)
-	 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)
+	 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)
 						% for vertices.
-	 vp=array:new() :: array(),		%Vertex positions.
+	 vp=array:new() :: array:array(),		%Vertex positions.
 	 pst=gb_trees:empty(),                  %Plugin State Info, 
 						%   gb_tree where key is plugin module
 	 mat=default,				%Materials.




--- src/wings__font.erl.orig
+++ src/wings__font.erl
@@ -11,45 +11,50 @@
 %%     $Id$
 %%
 
--module(wings__font, [Key,Desc,Width,Height,GlyphTab,Bitmaps]).
--export([key/0,desc/0,width/0,height/0,draw/1,char/1,char_width/1,
-	bold_char/1,bold_char_width/1]).
+-module(wings__font).
+-export([new/6,key/1,desc/1,width/1,height/1,draw/2,char/2,char_width/2,
+	bold_char/2,bold_char_width/2]).
 
-draw([C|T]) ->
-    char(C),
-    draw(T);
-draw([]) -> ok.
+-record(font, {key, desc, width, height, glyph_tab, bitmaps}).
 
-key() -> Key.
-desc() -> Desc.
+new(Key, Desc, Width, Height, GlyphTab, Bitmaps) ->
+    #font{key = Key, desc = Desc, width = Width, height = Height, glyph_tab = GlyphTab, bitmaps = Bitmaps}.
 
-char_width(C) ->
-    element(1, glyph_info(C)).
-width() ->
+draw(Font, [C|T]) ->
+    char(Font, C),
+    draw(Font, T);
+draw(_Font, []) -> ok.
+
+key(#font{key = Key}) -> Key.
+desc(#font{desc = Desc}) -> Desc.
+
+char_width(Font, C) ->
+    element(1, glyph_info(Font, C)).
+width(#font{width = Width}) ->
     insert_glyph(char_width, Width),
     Width.
-height() ->
+height(#font{height = Height}) ->
     insert_glyph(char_height, Height),
     Height.
 
-bold_char(C) ->
-    Glyph = glyph_info(C),
+bold_char(Font, C) ->
+    Glyph = glyph_info(Font, C),
     draw_glyph(Glyph),
     Cw = glyph_width(Glyph),
     gl:bitmap(1, 1, 0, 0, -Cw+1, 0, <<0>>),
     draw_glyph(Glyph).
 
-bold_char_width(C) ->
-    Glyph = glyph_info(C),
+bold_char_width(Font, C) ->
+    Glyph = glyph_info(Font, C),
     glyph_width(Glyph)+1.
 
-char(C) ->
-    draw_glyph(glyph_info(C)).
+char(Font, C) ->
+    draw_glyph(glyph_info(Font, C)).
 
 draw_glyph({W,H,Xorig,Yorig,Xmove,B}) ->
     gl:bitmap(W, H, Xorig, Yorig, Xmove, 0, B).
 
-glyph_info(C) ->
+glyph_info(#font{glyph_tab = GlyphTab, width = Width, height = Height, bitmaps = Bitmaps}, C) ->
     BitMap = case ets:lookup(GlyphTab, C) of
 	[] when is_integer(C), C > 0 ->
 	    %% Undefined character. Return a filled box.

Lines 1-11 Link Here

(-)files/patch-src_wings__menu.erl (-11 lines)
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.

Lines 1-11 Link Here

(-)files/patch-src_wings__sel.erl (-11 lines)
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),




--- src/wings_text.erl.orig
+++ src/wings_text.erl
@@ -65,7 +65,7 @@
 
 bold_string_width([C|S], W) ->
     BCW = case wings_font_table:bold_char_width(C) of
-        undefined -> (current_font()):bold_char_width(C);
+        undefined -> wings__font:bold_char_width(current_font(), C);
         Other -> Other
     end,
     bold_string_width(S, BCW+W);
@@ -74,19 +74,19 @@
 
 char_width(C) ->
     case wings_font_table:char_width(C) of
-        undefined -> (current_font()):char_width(C);
+        undefined -> wings__font:char_width(current_font(), C);
         Other -> Other
     end.
 
 width() ->
     case wings_font_table:char(char_width) of
-        undefined -> (current_font()):width();
+        undefined -> wings__font:width(current_font());
         Other -> Other
     end.
 
 height() ->
     case wings_font_table:char(char_height) of
-        undefined -> (current_font()):height();
+        undefined -> wings__font:height(current_font());
         Other -> Other
     end.
 
@@ -111,13 +111,13 @@
 char(C) when is_atom(C) -> special(C);
 char(C) ->
     case wings_font_table:char(C) of
-        undefined -> (current_font()):char(C);
+        undefined -> wings__font:char(current_font(), C);
         Other -> Other
     end.
 
 bold([C|S]) ->
     case wings_font_table:bold_char(C) of
-        undefined -> (current_font()):bold_char(C);
+        undefined -> wings__font:bold_char(current_font(), C);
         Other -> Other
     end,
     bold(S);
@@ -195,7 +195,7 @@
     CharWidth = wings_text:width([$\s])*2,
     Line = [$\s,$\s|Line0],
     string_to_text_box(Tb#tb{text=Text,lw=LW+CharWidth,line=Line});
-    
+
 string_to_text_box(#tb{text=[{Style,String}=Stylized|Text],lw=Lw, max=Max, line=Line0,res=Res}=Tb0) ->
     Sw = width([Stylized]),
     NLW = Lw + Sw,
@@ -504,8 +504,8 @@
     {ok,Bin} = file:read_file(FontDir),
     Font = binary_to_term(Bin),
     Mod = load_font_1(Font),
-    Key = Mod:key(),
-    Desc = Mod:desc(),
+    Key = wings__font:key(Mod),
+    Desc = wings__font:desc(Mod),
     ets:insert(wings_fonts, {Key,Mod,Desc}).
 
 load_font_1({wings_font,?wings_version,Font}) ->




--- src/wings_undo.erl.orig	2015-06-24 22:27:33 UTC
+++ src/wings_undo.erl
@@ -30,12 +30,12 @@
 	 
 %% The essential part of the state record.
 -record(est,
-	{shapes=[] :: list(#we{}) | gb_tree(),
+	{shapes=[] :: list(#we{}) | gb_trees:tree(),
 	 selmode=face :: sel_mode(),
 	 sel=[] :: list(),
 	 onext=1 :: elem_num(),
 	 mat=wings_material:default(),
-	 pst=gb_trees:empty() :: gb_tree(),
+	 pst=gb_trees:empty() :: gb_trees:tree(),
 
 	 %% For the Develop menu.
 	 cmd,




bin/wings
lib/erlang/lib/wings
lib/erlang/lib/wings-%%VERSION%%/ebin/array.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__png.beam

lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_transform.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_util.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_vec.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/orig_kd3.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/user_default.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings__font.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_align.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ask.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_body.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_camera.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc_ref.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cl.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_collapse.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam

lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_ndo.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_wings.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_file.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_font_table.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_gl.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_help.beam
lib/erlang/lib/wings-%%VERSION%%/ebin/wings_hotkey.beam

lib/erlang/lib/wings-%%VERSION%%/fonts/7x14.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-12.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-16.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB14.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB16.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB24.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica11.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica14.wingsfont
lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica20.wingsfont

lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_rotate_unconstrained.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sculpt.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sel_win.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shear.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shift.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sweep_extrude.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_untriangulate.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_views_win.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_weld.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/default/README
lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam

lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_bbox.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_cylinder.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_geodome.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_image.beam
lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_knot.beam

lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam
lib/erlang/lib/wings-%%VERSION%%/shaders/brick.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/brick.vs
lib/erlang/lib/wings-%%VERSION%%/shaders/cc_subdiv.cl
lib/erlang/lib/wings-%%VERSION%%/shaders/depth.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/depth.vs
lib/erlang/lib/wings-%%VERSION%%/shaders/envmap.fs

lib/erlang/lib/wings-%%VERSION%%/shaders/xray.fs
lib/erlang/lib/wings-%%VERSION%%/shaders/xray.vs
lib/erlang/lib/wings-%%VERSION%%/src/Makefile
lib/erlang/lib/wings-%%VERSION%%/src/array.erl
lib/erlang/lib/wings-%%VERSION%%/src/user_default.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings.hrl
lib/erlang/lib/wings-%%VERSION%%/src/wings.icon
lib/erlang/lib/wings-%%VERSION%%/src/wings__font.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_align.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_ask.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_body.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_camera.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_cc.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_cc_ref.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_cl.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_collapse.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl

lib/erlang/lib/wings-%%VERSION%%/src/wings_cs.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_de.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl.bak
lib/erlang/lib/wings-%%VERSION%%/src/wings_develop.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_dissolve.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl

lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_wings.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_fi.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_file.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_font_table.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_gl.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl

lib/erlang/lib/wings-%%VERSION%%/src/wings_io_wx.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_job.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_jp.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_ko.lang
lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl

lib/erlang/lib/wings-%%VERSION%%/src/wings_scale.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl.bak
lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_conv.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_shaders.erl
lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl

lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl
lib/erlang/lib/wings-%%VERSION%%/textures/brand.png
lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png
lib/erlang/lib/wings-%%VERSION%%/textures/ip_helper.png
share/pixmaps/wings.ico

Return to bug 213938

Lines 2-9 Link Here

(-)Makefile (-3 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wings	4	PORTNAME= wings
5	PORTVERSION= 1.4.1	5	PORTVERSION= 1.5.4
6	PORTREVISION= 6
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	DIST_SUBDIR= erlang	8	DIST_SUBDIR= erlang
Lines 17-28 Link Here
17	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
18		17
19	BUILD_DEPENDS= erl:lang/erlang \	18	BUILD_DEPENDS= erl:lang/erlang \
20	erlang-esdl>0:devel/erlang-esdl	19	erlang-esdl>0:devel/erlang-esdl \
		20	erlang-cl>0:devel/erlang-cl
21	RUN_DEPENDS:= ${BUILD_DEPENDS}	21	RUN_DEPENDS:= ${BUILD_DEPENDS}
22		22
23	MAKE_ENV= ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl	23	MAKE_ENV= ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
24	PLIST_SUB= VERSION="${PORTVERSION}"	24	PLIST_SUB= VERSION="${PORTVERSION}"
25	MAKE_JOBS_UNSAFE=yes	25	MAKE_JOBS_UNSAFE=yes
		26	USE_GL= gl glu
26		27
27	SUB_FILES= ${PORTNAME}.sh	28	SUB_FILES= ${PORTNAME}.sh
28		29
Lines 40-45 Link Here
40	post-patch:	41	post-patch:
41	@${REINPLACE_CMD} -e 's\|$$(GCC)\|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib\|g' \	42	@${REINPLACE_CMD} -e 's\|$$(GCC)\|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib\|g' \
42	${WRKSRC}/plugins_src/accel/Makefile	43	${WRKSRC}/plugins_src/accel/Makefile
		44	@${REINPLACE_CMD} -e 's\|random:\|rand:\|' \
		45	${WRKSRC}/src/wings_deform.erl \
		46	${WRKSRC}/src/wings_sel_cmd.erl \
		47	${WRKSRC}/e3d/e3d_util.erl \
		48	${WRKSRC}/plugins_src/autouv/auv_mapping.erl
43	@${FIND} ${WRKSRC} -name "*.orig" -delete	49	@${FIND} ${WRKSRC} -name "*.orig" -delete
44		50
45	do-install:	51	do-install:

Line 0 Link Here

(-)files/patch-e3d_e3d__qbvh.erl (+21 lines)
	1	--- e3d/e3d_qbvh.erl.orig 2015-08-06 10:38:19 UTC
	2	+++ e3d/e3d_qbvh.erl
	3	@@ -40,6 +40,7 @@
	4
	5	-define(F32, 32/float-native).
	6	-define(I32, 32/signed-native).
	7	+-define(U32, 32/unsigned-native).
	8	-define(QNODE_SZ, ((24+4)*4)).
	9	-define(QTRI_SZ, ((123+4)4)).
	10
	11	@@ -118,8 +119,8 @@ convert_to_image(W, <<BBs:(24*4)/binary,
	12	convert_to_image(_, <<>>, Acc) -> Acc.
	13
	14	convert_children(4, _W, Qns, Acc) -> {Qns, Acc};
	15	-convert_children(J, W, <<16#ffffffff:?I32, Qns/binary>>, Acc) -> %% EMPTY
	16	- convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?I32>>);
	17	+convert_children(J, W, <<16#ffffffff:?U32, Qns/binary>>, Acc) -> %% EMPTY
	18	+ convert_children(J+1, W, Qns, <<Acc/binary, 16#ffffffff:?U32>>);
	19	convert_children(J, W, <<C0:?I32, Qns/binary>>, Acc) when C0 < 0 -> %% IS_LEAF
	20	Count = first_quad(C0) * 10,
	21	X = (Count rem W) div 10, %% "div 10" in order to not waste bits

Lines 1-60 Link Here

(-)files/patch-plugins__src-accel-perlin__noise__drv.c (-60 lines)
1	--- plugins_src/accel/perlin_noise_drv.c.orig
2	+++ plugins_src/accel/perlin_noise_drv.c
3	@@ -22,6 +22,11 @@
4	#include <math.h>
5	#include <string.h>
6
7	+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
8	+typedef int ErlDrvSizeT;
9	+typedef int ErlDrvSSizeT;
10	+#endif
11	+
12	#define PNOISE3 3
13	#define SNOISE1 4
14	#define SNOISE2 5
15	@@ -57,9 +62,9 @@
16	*/
17	static ErlDrvData perlin_noise_start(ErlDrvPort port, char *buff);
18	static void perlin_noise_stop(ErlDrvData handle);
19	-static int control(ErlDrvData handle, unsigned int command,
20	- char* buff, int count,
21	- char** res, int res_size);
22	+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
23	+ char* buff, ErlDrvSizeT count,
24	+ char** res, ErlDrvSizeT res_size);
25
26	/*
27	* Internal routines
28	@@ -82,7 +87,18 @@
29	NULL, /* void * that is not used (BC) */
30	control, /* F_PTR control, port_control callback */
31	NULL, /* F_PTR timeout, driver_set_timer callback */
32	- NULL /* F_PTR outputv, reserved */
33	+ NULL, /* F_PTR outputv, reserved */
34	+ NULL,
35	+ NULL,
36	+ NULL,
37	+ NULL,
38	+ ERL_DRV_EXTENDED_MARKER,
39	+ ERL_DRV_EXTENDED_MAJOR_VERSION,
40	+ ERL_DRV_EXTENDED_MINOR_VERSION,
41	+ 0,
42	+ NULL,
43	+ NULL,
44	+ NULL
45	};
46
47	/*
48	@@ -114,9 +130,9 @@
49
50	}
51
52	-static int control(ErlDrvData handle, unsigned int command,
53	- char* buff, int count,
54	- char** res, int res_size)
55	+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
56	+ char* buff, ErlDrvSizeT count,
57	+ char** res, ErlDrvSizeT res_size)
58	{
59	ErlDrvBinary* bin;
60

Lines 1-64 Link Here

(-)files/patch-plugins__src-accel-wings__pick__drv.c (-64 lines)
1	--- plugins_src/accel/wings_pick_drv.c.orig
2	+++ plugins_src/accel/wings_pick_drv.c
3	@@ -20,14 +20,19 @@
4	#endif
5	#include <string.h>
6
7	+#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
8	+typedef int ErlDrvSizeT;
9	+typedef int ErlDrvSSizeT;
10	+#endif
11	+
12	/*
13	* Interface routines.
14	*/
15	static ErlDrvData wings_file_start(ErlDrvPort port, char *buff);
16	static void wings_file_stop(ErlDrvData handle);
17	-static int control(ErlDrvData handle, unsigned int command,
18	- char* buff, int count,
19	- char** res, int res_size);
20	+static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
21	+ char* buff, ErlDrvSizeT count,
22	+ char** res, ErlDrvSizeT res_size);
23	static void outputv(ErlDrvData drv_data, ErlIOVec* ev);
24
25	/*
26	@@ -47,7 +52,18 @@
27	NULL, /* void * that is not used (BC) */
28	control, /* F_PTR control, port_control callback */
29	NULL, /* F_PTR timeout, driver_set_timer callback */
30	- outputv /* F_PTR outputv, reserved */
31	+ outputv, /* F_PTR outputv, reserved */
32	+ NULL,
33	+ NULL,
34	+ NULL,
35	+ NULL,
36	+ ERL_DRV_EXTENDED_MARKER,
37	+ ERL_DRV_EXTENDED_MAJOR_VERSION,
38	+ ERL_DRV_EXTENDED_MINOR_VERSION,
39	+ 0,
40	+ NULL,
41	+ NULL,
42	+ NULL
43	};
44
45	struct vertex_struct {
46	@@ -107,14 +123,14 @@
47	* Handle commands.
48	*/
49
50	-static int
51	+static ErlDrvSSizeT
52	control(ErlDrvData handle, unsigned int command,
53	- char* buf, int count,
54	- char** res, int res_size)
55	+ char* buf, ErlDrvSizeT count,
56	+ char** res, ErlDrvSizeT res_size)
57	{
58	switch (command) {
59	case 0: { /* Define matrix */
60	- memcpy((void ) m, (void ) buf, count);
61	+ memcpy((void ) m, (void ) buf, (size_t) count);
62	#if 0
63	{
64	int i, j;

Lines 1-62 Link Here

(-)files/patch-src_wings.hrl (-62 lines)
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.

Lines 1-73 Link Here

(-)files/patch-src_wings____font.erl (-73 lines)
1	--- src/wings__font.erl.orig
2	+++ src/wings__font.erl
3	@@ -11,45 +11,50 @@
4	%% $Id$
5	%%
6
7	--module(wings__font, [Key,Desc,Width,Height,GlyphTab,Bitmaps]).
8	--export([key/0,desc/0,width/0,height/0,draw/1,char/1,char_width/1,
9	- bold_char/1,bold_char_width/1]).
10	+-module(wings__font).
11	+-export([new/6,key/1,desc/1,width/1,height/1,draw/2,char/2,char_width/2,
12	+ bold_char/2,bold_char_width/2]).
13
14	-draw([C\|T]) ->
15	- char(C),
16	- draw(T);
17	-draw([]) -> ok.
18	+-record(font, {key, desc, width, height, glyph_tab, bitmaps}).
19
20	-key() -> Key.
21	-desc() -> Desc.
22	+new(Key, Desc, Width, Height, GlyphTab, Bitmaps) ->
23	+ #font{key = Key, desc = Desc, width = Width, height = Height, glyph_tab = GlyphTab, bitmaps = Bitmaps}.
24
25	-char_width(C) ->
26	- element(1, glyph_info(C)).
27	-width() ->
28	+draw(Font, [C\|T]) ->
29	+ char(Font, C),
30	+ draw(Font, T);
31	+draw(_Font, []) -> ok.
32	+
33	+key(#font{key = Key}) -> Key.
34	+desc(#font{desc = Desc}) -> Desc.
35	+
36	+char_width(Font, C) ->
37	+ element(1, glyph_info(Font, C)).
38	+width(#font{width = Width}) ->
39	insert_glyph(char_width, Width),
40	Width.
41	-height() ->
42	+height(#font{height = Height}) ->
43	insert_glyph(char_height, Height),
44	Height.
45
46	-bold_char(C) ->
47	- Glyph = glyph_info(C),
48	+bold_char(Font, C) ->
49	+ Glyph = glyph_info(Font, C),
50	draw_glyph(Glyph),
51	Cw = glyph_width(Glyph),
52	gl:bitmap(1, 1, 0, 0, -Cw+1, 0, <<0>>),
53	draw_glyph(Glyph).
54
55	-bold_char_width(C) ->
56	- Glyph = glyph_info(C),
57	+bold_char_width(Font, C) ->
58	+ Glyph = glyph_info(Font, C),
59	glyph_width(Glyph)+1.
60
61	-char(C) ->
62	- draw_glyph(glyph_info(C)).
63	+char(Font, C) ->
64	+ draw_glyph(glyph_info(Font, C)).
65
66	draw_glyph({W,H,Xorig,Yorig,Xmove,B}) ->
67	gl:bitmap(W, H, Xorig, Yorig, Xmove, 0, B).
68
69	-glyph_info(C) ->
70	+glyph_info(#font{glyph_tab = GlyphTab, width = Width, height = Height, bitmaps = Bitmaps}, C) ->
71	BitMap = case ets:lookup(GlyphTab, C) of
72	[] when is_integer(C), C > 0 ->
73	%% Undefined character. Return a filled box.

Lines 1-70 Link Here

(-)files/patch-src_wings__text.erl (-70 lines)
1	--- src/wings_text.erl.orig
2	+++ src/wings_text.erl
3	@@ -65,7 +65,7 @@
4
5	bold_string_width([C\|S], W) ->
6	BCW = case wings_font_table:bold_char_width(C) of
7	- undefined -> (current_font()):bold_char_width(C);
8	+ undefined -> wings__font:bold_char_width(current_font(), C);
9	Other -> Other
10	end,
11	bold_string_width(S, BCW+W);
12	@@ -74,19 +74,19 @@
13
14	char_width(C) ->
15	case wings_font_table:char_width(C) of
16	- undefined -> (current_font()):char_width(C);
17	+ undefined -> wings__font:char_width(current_font(), C);
18	Other -> Other
19	end.
20
21	width() ->
22	case wings_font_table:char(char_width) of
23	- undefined -> (current_font()):width();
24	+ undefined -> wings__font:width(current_font());
25	Other -> Other
26	end.
27
28	height() ->
29	case wings_font_table:char(char_height) of
30	- undefined -> (current_font()):height();
31	+ undefined -> wings__font:height(current_font());
32	Other -> Other
33	end.
34
35	@@ -111,13 +111,13 @@
36	char(C) when is_atom(C) -> special(C);
37	char(C) ->
38	case wings_font_table:char(C) of
39	- undefined -> (current_font()):char(C);
40	+ undefined -> wings__font:char(current_font(), C);
41	Other -> Other
42	end.
43
44	bold([C\|S]) ->
45	case wings_font_table:bold_char(C) of
46	- undefined -> (current_font()):bold_char(C);
47	+ undefined -> wings__font:bold_char(current_font(), C);
48	Other -> Other
49	end,
50	bold(S);
51	@@ -195,7 +195,7 @@
52	CharWidth = wings_text:width([$\s])*2,
53	Line = [$\s,$\s\|Line0],
54	string_to_text_box(Tb#tb{text=Text,lw=LW+CharWidth,line=Line});
55	-
56	+
57	string_to_text_box(#tb{text=[{Style,String}=Stylized\|Text],lw=Lw, max=Max, line=Line0,res=Res}=Tb0) ->
58	Sw = width([Stylized]),
59	NLW = Lw + Sw,
60	@@ -504,8 +504,8 @@
61	{ok,Bin} = file:read_file(FontDir),
62	Font = binary_to_term(Bin),
63	Mod = load_font_1(Font),
64	- Key = Mod:key(),
65	- Desc = Mod:desc(),
66	+ Key = wings__font:key(Mod),
67	+ Desc = wings__font:desc(Mod),
68	ets:insert(wings_fonts, {Key,Mod,Desc}).
69
70	load_font_1({wings_font,?wings_version,Font}) ->

Lines 1-17 Link Here

(-)files/patch-src_wings__undo.erl (-17 lines)
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,

Lines 1-6 Link Here

(-)pkg-plist (-8 / +17 lines)
1	bin/wings	1	bin/wings
2	lib/erlang/lib/wings	2	lib/erlang/lib/wings
3	lib/erlang/lib/wings-%%VERSION%%/ebin/array.beam
4	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam	3	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam
5	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam	4	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam
6	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__png.beam	5	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__png.beam
Lines 21-34 Link Here
21	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_transform.beam	20	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_transform.beam
22	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_util.beam	21	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_util.beam
23	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_vec.beam	22	lib/erlang/lib/wings-%%VERSION%%/ebin/e3d_vec.beam
24	lib/erlang/lib/wings-%%VERSION%%/ebin/orig_kd3.beam
25	lib/erlang/lib/wings-%%VERSION%%/ebin/user_default.beam	23	lib/erlang/lib/wings-%%VERSION%%/ebin/user_default.beam
26	lib/erlang/lib/wings-%%VERSION%%/ebin/wings.beam	24	lib/erlang/lib/wings-%%VERSION%%/ebin/wings.beam
27	lib/erlang/lib/wings-%%VERSION%%/ebin/wings__font.beam
28	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_align.beam	25	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_align.beam
29	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ask.beam	26	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ask.beam
30	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_body.beam	27	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_body.beam
31	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_camera.beam	28	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_camera.beam
		29	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc.beam
		30	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cc_ref.beam
		31	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_cl.beam
32	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_collapse.beam	32	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_collapse.beam
33	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam	33	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_color.beam
34	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam	34	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_console.beam
Lines 51-57 Link Here
51	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_ndo.beam	51	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_ndo.beam
52	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_wings.beam	52	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_ff_wings.beam
53	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_file.beam	53	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_file.beam
54	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_font_table.beam
55	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_gl.beam	54	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_gl.beam
56	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_help.beam	55	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_help.beam
57	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_hotkey.beam	56	lib/erlang/lib/wings-%%VERSION%%/ebin/wings_hotkey.beam
Lines 120-125 Link Here
120	lib/erlang/lib/wings-%%VERSION%%/fonts/7x14.wingsfont	119	lib/erlang/lib/wings-%%VERSION%%/fonts/7x14.wingsfont
121	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-12.wingsfont	120	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-12.wingsfont
122	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-16.wingsfont	121	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-16.wingsfont
		122	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB14.wingsfont
		123	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB16.wingsfont
		124	lib/erlang/lib/wings-%%VERSION%%/fonts/CJK-efontB24.wingsfont
123	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica11.wingsfont	125	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica11.wingsfont
124	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica14.wingsfont	126	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica14.wingsfont
125	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica20.wingsfont	127	lib/erlang/lib/wings-%%VERSION%%/fonts/Helvetica20.wingsfont
Lines 181-191 Link Here
181	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam	183	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_region.beam
182	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_rotate_unconstrained.beam	184	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_rotate_unconstrained.beam
183	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sculpt.beam	185	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sculpt.beam
		186	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sel_win.beam
184	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shear.beam	187	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shear.beam
185	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shift.beam	188	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_shift.beam
186	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sweep_extrude.beam	189	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_sweep_extrude.beam
187	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam	190	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_turnedge.beam
188	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_untriangulate.beam	191	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_untriangulate.beam
		192	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_views_win.beam
189	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_weld.beam	193	lib/erlang/lib/wings-%%VERSION%%/plugins/commands/wpc_weld.beam
190	lib/erlang/lib/wings-%%VERSION%%/plugins/default/README	194	lib/erlang/lib/wings-%%VERSION%%/plugins/default/README
191	lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam	195	lib/erlang/lib/wings-%%VERSION%%/plugins/default/wp9_dialogs.beam
Lines 209-215 Link Here
209	lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam	213	lib/erlang/lib/wings-%%VERSION%%/plugins/import_export/wpc_yafray.beam
210	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README	214	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/README
211	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_bbox.beam	215	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_bbox.beam
212	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_gear.beam	216	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_cylinder.beam
213	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_geodome.beam	217	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_geodome.beam
214	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_image.beam	218	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_image.beam
215	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_knot.beam	219	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_knot.beam
Lines 220-225 Link Here
220	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam	224	lib/erlang/lib/wings-%%VERSION%%/plugins/primitives/wpc_tt.beam
221	lib/erlang/lib/wings-%%VERSION%%/shaders/brick.fs	225	lib/erlang/lib/wings-%%VERSION%%/shaders/brick.fs
222	lib/erlang/lib/wings-%%VERSION%%/shaders/brick.vs	226	lib/erlang/lib/wings-%%VERSION%%/shaders/brick.vs
		227	lib/erlang/lib/wings-%%VERSION%%/shaders/cc_subdiv.cl
223	lib/erlang/lib/wings-%%VERSION%%/shaders/depth.fs	228	lib/erlang/lib/wings-%%VERSION%%/shaders/depth.fs
224	lib/erlang/lib/wings-%%VERSION%%/shaders/depth.vs	229	lib/erlang/lib/wings-%%VERSION%%/shaders/depth.vs
225	lib/erlang/lib/wings-%%VERSION%%/shaders/envmap.fs	230	lib/erlang/lib/wings-%%VERSION%%/shaders/envmap.fs
Lines 245-260 Link Here
245	lib/erlang/lib/wings-%%VERSION%%/shaders/xray.fs	250	lib/erlang/lib/wings-%%VERSION%%/shaders/xray.fs
246	lib/erlang/lib/wings-%%VERSION%%/shaders/xray.vs	251	lib/erlang/lib/wings-%%VERSION%%/shaders/xray.vs
247	lib/erlang/lib/wings-%%VERSION%%/src/Makefile	252	lib/erlang/lib/wings-%%VERSION%%/src/Makefile
248	lib/erlang/lib/wings-%%VERSION%%/src/array.erl
249	lib/erlang/lib/wings-%%VERSION%%/src/user_default.erl	253	lib/erlang/lib/wings-%%VERSION%%/src/user_default.erl
250	lib/erlang/lib/wings-%%VERSION%%/src/wings.erl	254	lib/erlang/lib/wings-%%VERSION%%/src/wings.erl
251	lib/erlang/lib/wings-%%VERSION%%/src/wings.hrl	255	lib/erlang/lib/wings-%%VERSION%%/src/wings.hrl
252	lib/erlang/lib/wings-%%VERSION%%/src/wings.icon	256	lib/erlang/lib/wings-%%VERSION%%/src/wings.icon
253	lib/erlang/lib/wings-%%VERSION%%/src/wings__font.erl
254	lib/erlang/lib/wings-%%VERSION%%/src/wings_align.erl	257	lib/erlang/lib/wings-%%VERSION%%/src/wings_align.erl
255	lib/erlang/lib/wings-%%VERSION%%/src/wings_ask.erl	258	lib/erlang/lib/wings-%%VERSION%%/src/wings_ask.erl
256	lib/erlang/lib/wings-%%VERSION%%/src/wings_body.erl	259	lib/erlang/lib/wings-%%VERSION%%/src/wings_body.erl
257	lib/erlang/lib/wings-%%VERSION%%/src/wings_camera.erl	260	lib/erlang/lib/wings-%%VERSION%%/src/wings_camera.erl
		261	lib/erlang/lib/wings-%%VERSION%%/src/wings_cc.erl
		262	lib/erlang/lib/wings-%%VERSION%%/src/wings_cc_ref.erl
		263	lib/erlang/lib/wings-%%VERSION%%/src/wings_cl.erl
258	lib/erlang/lib/wings-%%VERSION%%/src/wings_collapse.erl	264	lib/erlang/lib/wings-%%VERSION%%/src/wings_collapse.erl
259	lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl	265	lib/erlang/lib/wings-%%VERSION%%/src/wings_color.erl
260	lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl	266	lib/erlang/lib/wings-%%VERSION%%/src/wings_console.erl
Lines 262-267 Link Here
262	lib/erlang/lib/wings-%%VERSION%%/src/wings_cs.lang	268	lib/erlang/lib/wings-%%VERSION%%/src/wings_cs.lang
263	lib/erlang/lib/wings-%%VERSION%%/src/wings_de.lang	269	lib/erlang/lib/wings-%%VERSION%%/src/wings_de.lang
264	lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl	270	lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl
		271	lib/erlang/lib/wings-%%VERSION%%/src/wings_deform.erl.bak
265	lib/erlang/lib/wings-%%VERSION%%/src/wings_develop.erl	272	lib/erlang/lib/wings-%%VERSION%%/src/wings_develop.erl
266	lib/erlang/lib/wings-%%VERSION%%/src/wings_dissolve.erl	273	lib/erlang/lib/wings-%%VERSION%%/src/wings_dissolve.erl
267	lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl	274	lib/erlang/lib/wings-%%VERSION%%/src/wings_dl.erl
Lines 281-287 Link Here
281	lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_wings.erl	288	lib/erlang/lib/wings-%%VERSION%%/src/wings_ff_wings.erl
282	lib/erlang/lib/wings-%%VERSION%%/src/wings_fi.lang	289	lib/erlang/lib/wings-%%VERSION%%/src/wings_fi.lang
283	lib/erlang/lib/wings-%%VERSION%%/src/wings_file.erl	290	lib/erlang/lib/wings-%%VERSION%%/src/wings_file.erl
284	lib/erlang/lib/wings-%%VERSION%%/src/wings_font_table.erl
285	lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang	291	lib/erlang/lib/wings-%%VERSION%%/src/wings_fr.lang
286	lib/erlang/lib/wings-%%VERSION%%/src/wings_gl.erl	292	lib/erlang/lib/wings-%%VERSION%%/src/wings_gl.erl
287	lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl	293	lib/erlang/lib/wings-%%VERSION%%/src/wings_help.erl
Lines 294-299 Link Here
294	lib/erlang/lib/wings-%%VERSION%%/src/wings_io_wx.erl	300	lib/erlang/lib/wings-%%VERSION%%/src/wings_io_wx.erl
295	lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang	301	lib/erlang/lib/wings-%%VERSION%%/src/wings_it.lang
296	lib/erlang/lib/wings-%%VERSION%%/src/wings_job.erl	302	lib/erlang/lib/wings-%%VERSION%%/src/wings_job.erl
		303	lib/erlang/lib/wings-%%VERSION%%/src/wings_jp.lang
297	lib/erlang/lib/wings-%%VERSION%%/src/wings_ko.lang	304	lib/erlang/lib/wings-%%VERSION%%/src/wings_ko.lang
298	lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl	305	lib/erlang/lib/wings-%%VERSION%%/src/wings_lang.erl
299	lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl	306	lib/erlang/lib/wings-%%VERSION%%/src/wings_light.erl
Lines 320-325 Link Here
320	lib/erlang/lib/wings-%%VERSION%%/src/wings_scale.erl	327	lib/erlang/lib/wings-%%VERSION%%/src/wings_scale.erl
321	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel.erl	328	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel.erl
322	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl	329	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl
		330	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_cmd.erl.bak
323	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_conv.erl	331	lib/erlang/lib/wings-%%VERSION%%/src/wings_sel_conv.erl
324	lib/erlang/lib/wings-%%VERSION%%/src/wings_shaders.erl	332	lib/erlang/lib/wings-%%VERSION%%/src/wings_shaders.erl
325	lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl	333	lib/erlang/lib/wings-%%VERSION%%/src/wings_shape.erl
Lines 351-354 Link Here
351	lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl	359	lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl
352	lib/erlang/lib/wings-%%VERSION%%/textures/brand.png	360	lib/erlang/lib/wings-%%VERSION%%/textures/brand.png
353	lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png	361	lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png
		362	lib/erlang/lib/wings-%%VERSION%%/textures/ip_helper.png
354	share/pixmaps/wings.ico	363	share/pixmaps/wings.ico