[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14728] branches/cloth/blender: Resolved other bad files in branch, had to kick old bullet, will have to copy from trunk

[Daniel Genrich]

Revision: 14728
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14728
Author:   genscher
Date:     2008-05-07 22:06:28 +0200 (Wed, 07 May 2008)

Log Message:
-----------
Resolved other bad files in branch, had to kick old bullet, will have to copy from trunk

Modified Paths:
--------------
    branches/cloth/blender/source/blender/include/BIF_imasel.h
    branches/cloth/blender/source/blender/include/BSE_drawview.h
    branches/cloth/blender/source/blender/include/BSE_filesel.h
    branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h

Removed Paths:
-------------
    branches/cloth/blender/extern/bullet2/

Modified: branches/cloth/blender/source/blender/include/BIF_imasel.h
===================================================================
--- branches/cloth/blender/source/blender/include/BIF_imasel.h	2008-05-07 19:25:43 UTC (rev 14727)
+++ branches/cloth/blender/source/blender/include/BIF_imasel.h	2008-05-07 20:06:28 UTC (rev 14728)
@@ -34,6 +34,7 @@
 struct ID;
 
 void free_imasel(struct SpaceImaSel *simasel);
+void reset_imaselspace(struct ScrArea *sa);
 
 void clever_numbuts_imasel(void);
 

Modified: branches/cloth/blender/source/blender/include/BSE_drawview.h
===================================================================
--- branches/cloth/blender/source/blender/include/BSE_drawview.h	2008-05-07 19:25:43 UTC (rev 14727)
+++ branches/cloth/blender/source/blender/include/BSE_drawview.h	2008-05-07 20:06:28 UTC (rev 14728)
@@ -46,7 +46,7 @@
 /* View3DAfter->type */
 #define V3D_XRAY	1
 #define V3D_TRANSP	2
-void add_view3d_after(struct View3D *v3d, struct Base *base, int type);
+void add_view3d_after(struct View3D *v3d, struct Base *base, int type, int flag);
 
 void backdrawview3d(int test);
 void check_backbuf(void);

Modified: branches/cloth/blender/source/blender/include/BSE_filesel.h
===================================================================
--- branches/cloth/blender/source/blender/include/BSE_filesel.h	2008-05-07 19:25:43 UTC (rev 14727)
+++ branches/cloth/blender/source/blender/include/BSE_filesel.h	2008-05-07 20:06:28 UTC (rev 14728)
@@ -54,6 +54,7 @@
 void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2);
 
 void filesel_prevspace(void);
+void reset_filespace(struct ScrArea *sa);
 void free_filesel_spec(char *dir);
 void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
 void main_to_filelist(struct SpaceFile *sfile);   

Modified: branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h	2008-05-07 19:25:43 UTC (rev 14727)
+++ branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h	2008-05-07 20:06:28 UTC (rev 14728)
@@ -224,7 +224,7 @@
 #define USER_DUPLILINK			(1 << 6)
 #define USER_FSCOLLUM			(1 << 7)
 #define USER_MAT_ON_OB			(1 << 8)
-#define USER_NO_CAPSLOCK		(1 << 9)
+/*#define USER_NO_CAPSLOCK		(1 << 9)*/ /* not used anywhere */
 #define USER_VIEWMOVE			(1 << 10)
 #define USER_TOOLTIPS			(1 << 11)
 #define USER_TWOBUTTONMOUSE		(1 << 12)
@@ -236,7 +236,8 @@
 #define USER_ADD_EDITMODE		(1 << 18)
 #define USER_ADD_VIEWALIGNED	(1 << 19)
 #define USER_RELPATHS			(1 << 20)
-#define USER_DRAGIMMEDIATE			(1 << 21)
+#define USER_DRAGIMMEDIATE		(1 << 21)
+#define USER_DONT_DOSCRIPTLINKS	(1 << 22)
 
 /* viewzom */
 #define USER_ZOOM_CONT			0