[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48418] branches/soc-2012-swiss_cheese/ source: Set svn:eol-style to native
Nicholas Bishop
nicholasbishop at gmail.com
Sat Jun 30 00:40:24 CEST 2012
Revision: 48418
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48418
Author: nicholasbishop
Date: 2012-06-29 22:40:14 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Set svn:eol-style to native
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_lighting.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_primitives.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_utility.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_debug.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_vbo.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives_inline.h
Property Changed:
----------------
branches/soc-2012-swiss_cheese/source/blender/empty.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_lighting.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_primitives.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_utility.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_debug.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_internal.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_vbo.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives_inline.h
branches/soc-2012-swiss_cheese/source/blenderplayer/androidfix.c
Property changes on: branches/soc-2012-swiss_cheese/source/blender/empty.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h 2012-06-29 22:31:28 UTC (rev 48417)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h 2012-06-29 22:40:14 UTC (rev 48418)
@@ -1,41 +1,41 @@
-/*
- * ***** 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) 2012 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Jason Wilkins
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/gpu/GPU_colors.h
- * \ingroup gpu
- */
-
-#define CPACK_BLACK 0x000000
-#define CPACK_WHITE 0xFFFFFF
-
-#define CPACK_RED 0xFF0000
-#define CPACK_GREEN 0x00FF00
-#define CPACK_BLUE 0x0000FF
-
-#define CPACK_YELLOW 0xFFFF00
-#define CPACK_CYAN 0x00FFFF
-#define CPACK_MAGENTA 0xFF00FF
+/*
+ * ***** 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) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Jason Wilkins
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/gpu/GPU_colors.h
+ * \ingroup gpu
+ */
+
+#define CPACK_BLACK 0x000000
+#define CPACK_WHITE 0xFFFFFF
+
+#define CPACK_RED 0xFF0000
+#define CPACK_GREEN 0x00FF00
+#define CPACK_BLUE 0x0000FF
+
+#define CPACK_YELLOW 0xFFFF00
+#define CPACK_CYAN 0x00FFFF
+#define CPACK_MAGENTA 0xFF00FF
Property changes on: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_colors.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h 2012-06-29 22:31:28 UTC (rev 48417)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h 2012-06-29 22:40:14 UTC (rev 48418)
@@ -1,35 +1,35 @@
-/* ***** 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) 2012 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Jason Wilkins.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/gpu/GPU_functions.h
- * \ingroup gpu
- */
-#ifndef GPU_FUNCTIONS_H
-#define GPU_FUNTCIONS_H
-
+/* ***** 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) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Jason Wilkins.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/gpu/GPU_functions.h
+ * \ingroup gpu
+ */
+#ifndef GPU_FUNCTIONS_H
+#define GPU_FUNTCIONS_H
+
#include "intern/gpu_immediate.h" /* XXX: temporary, will re-factor header files later */
@@ -37,154 +37,154 @@
#undef GLAPIENTRY /* glew.h was included above, so GLAPIENTRY is defined, but blank */
/***** BEGIN:THIS CODE WAS COPIED DIRECTLY FROM glew.h *****/
-
-#if defined(_WIN32)
-
-/*
- * GLEW does not include <windows.h> to avoid name space pollution.
- * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
- * defined properly.
- */
-/* <windef.h> */
-#ifndef APIENTRY
-#define GLEW_APIENTRY_DEFINED
-# if defined(__MINGW32__) || defined(__CYGWIN__)
-# define APIENTRY __stdcall
-# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
-# define APIENTRY __stdcall
-# else
-# define APIENTRY
-# endif
-#endif
-#ifndef GLAPI
-# if defined(__MINGW32__) || defined(__CYGWIN__)
-# define GLAPI extern
-# endif
-#endif
-/* <winnt.h> */
-#ifndef CALLBACK
-#define GLEW_CALLBACK_DEFINED
-# if defined(__MINGW32__) || defined(__CYGWIN__)
-# define CALLBACK __attribute__ ((__stdcall__))
-# elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
-# define CALLBACK __stdcall
-# else
-# define CALLBACK
-# endif
-#endif
-/* <wingdi.h> and <winnt.h> */
-#ifndef WINGDIAPI
-#define GLEW_WINGDIAPI_DEFINED
-#define WINGDIAPI __declspec(dllimport)
-#endif
-/* <ctype.h> */
-#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
-typedef unsigned short wchar_t;
-# define _WCHAR_T_DEFINED
-#endif
-/* <stddef.h> */
-#if !defined(_W64)
-# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300
-# define _W64 __w64
-# else
-# define _W64
-# endif
-#endif
-#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__)
-# ifdef _WIN64
-typedef __int64 ptrdiff_t;
-# else
-typedef _W64 int ptrdiff_t;
-# endif
-# define _PTRDIFF_T_DEFINED
-# define _PTRDIFF_T_
-#endif
-
-#ifndef GLAPI
-# if defined(__MINGW32__) || defined(__CYGWIN__)
-# define GLAPI extern
-# else
-# define GLAPI WINGDIAPI
-# endif
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY APIENTRY
-#endif
-
-/*
- * GLEW_STATIC is defined for static library.
- * GLEW_BUILD is defined for building the DLL library.
- */
-
-#ifdef GLEW_STATIC
-# define GLEWAPI extern
-#else
-# ifdef GLEW_BUILD
-# define GLEWAPI extern __declspec(dllexport)
-# else
-# define GLEWAPI extern __declspec(dllimport)
-# endif
-#endif
-
-#else /* _UNIX */
-
-/*
- * Needed for ptrdiff_t in turn needed by VBO. This is defined by ISO
- * C. On my system, this amounts to _3 lines_ of included code, all of
- * them pretty much harmless. If you know of a way of detecting 32 vs
- * 64 _targets_ at compile time you are free to replace this with
- * something that's portable. For now, _this_ is the portable solution.
- * (mem, 2004-01-04)
- */
-
-#include <stddef.h>
-
-/* SGI MIPSPro doesn't like stdint.h in C++ mode */
-/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */
-
-#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__)
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-
-#define GLEW_APIENTRY_DEFINED
-#define APIENTRY
-
-/*
- * GLEW_STATIC is defined for static library.
- */
-
-#ifdef GLEW_STATIC
-# define GLEWAPI extern
-#else
-# if defined(__GNUC__) && __GNUC__>=4
-# define GLEWAPI extern __attribute__ ((visibility("default")))
-# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# define GLEWAPI extern __global
-# else
-# define GLEWAPI extern
-# endif
-#endif
-
-/* <glu.h> */
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#endif /* _WIN32 */
+#if defined(_WIN32)
+
+/*
+ * GLEW does not include <windows.h> to avoid name space pollution.
+ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
+ * defined properly.
+ */
+/* <windef.h> */
+#ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define APIENTRY __stdcall
+# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+# define APIENTRY __stdcall
+# else
+# define APIENTRY
+# endif
+#endif
+#ifndef GLAPI
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define GLAPI extern
+# endif
+#endif
+/* <winnt.h> */
+#ifndef CALLBACK
+#define GLEW_CALLBACK_DEFINED
+# if defined(__MINGW32__) || defined(__CYGWIN__)
+# define CALLBACK __attribute__ ((__stdcall__))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list