[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37794] trunk/blender/source/blender/ blenlib: move callbacks file out of intern ( only contains 1 function but re-using it for new callback api)

Campbell Barton ideasman42 at gmail.com
Fri Jun 24 17:10:35 CEST 2011


Revision: 37794
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37794
Author:   campbellbarton
Date:     2011-06-24 15:10:34 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
move callbacks file out of intern (only contains 1 function but re-using it for new callback api)

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/CMakeLists.txt

Added Paths:
-----------
    trunk/blender/source/blender/blenlib/BLI_callbacks.h

Removed Paths:
-------------
    trunk/blender/source/blender/blenlib/intern/BLI_callbacks.h

Copied: trunk/blender/source/blender/blenlib/BLI_callbacks.h (from rev 37780, trunk/blender/source/blender/blenlib/intern/BLI_callbacks.h)
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_callbacks.h	                        (rev 0)
+++ trunk/blender/source/blender/blenlib/BLI_callbacks.h	2011-06-24 15:10:34 UTC (rev 37794)
@@ -0,0 +1,44 @@
+/*
+ * $Id:
+ *
+ * These callbacks are needed in the lib
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): mar 2001 Nzc
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenlib/intern/BLI_callbacks.h
+ *  \ingroup bli
+ */
+
+
+#ifndef BLI_CALLBACKS_H
+#define BLI_CALLBACKS_H
+
+// This is blenlib internal only
+void callLocalErrorCallBack(const char* msg);
+
+#endif
+


Property changes on: trunk/blender/source/blender/blenlib/BLI_callbacks.h
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt	2011-06-24 14:20:09 UTC (rev 37793)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt	2011-06-24 15:10:34 UTC (rev 37794)
@@ -89,6 +89,7 @@
 	BLI_blenlib.h
 	BLI_boxpack2d.h
 	BLI_bpath.h
+	BLI_callbacks.h
 	BLI_cpu.h
 	BLI_dlrbTree.h
 	BLI_dynlib.h
@@ -132,7 +133,6 @@
 	BLI_voxel.h
 	BLI_winstuff.h
 	PIL_time.h
-	intern/BLI_callbacks.h
 	intern/dynamiclist.h
 )
 

Deleted: trunk/blender/source/blender/blenlib/intern/BLI_callbacks.h
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_callbacks.h	2011-06-24 14:20:09 UTC (rev 37793)
+++ trunk/blender/source/blender/blenlib/intern/BLI_callbacks.h	2011-06-24 15:10:34 UTC (rev 37794)
@@ -1,46 +0,0 @@
-/*
- * blenlib/BLI_editVert.h    mar 2001 Nzc
- *
- * These callbacks are needed in the lib
- *
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenlib/intern/BLI_callbacks.h
- *  \ingroup bli
- */
-
-
-#ifndef BLI_CALLBACKS_H
-#define BLI_CALLBACKS_H
-
-// This is blenlib internal only
-void callLocalErrorCallBack(const char* msg);
-
-#endif
-




More information about the Bf-blender-cvs mailing list