[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30238] branches/soc-2010-jwilkins: Merged with trunk: 30052-30236
Jason Wilkins
Jason.A.Wilkins at gmail.com
Mon Jul 12 21:06:03 CEST 2010
Revision: 30238
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30238
Author: jwilkins
Date: 2010-07-12 21:06:01 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
Merged with trunk: 30052-30236
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/config/darwin-config.py
branches/soc-2010-jwilkins/config/linux2-config.py
branches/soc-2010-jwilkins/extern/glew/include/GL/glew.h
branches/soc-2010-jwilkins/extern/glew/src/glew.c
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/blender.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2010-jwilkins/release/scripts/op/presets.py
branches/soc-2010-jwilkins/release/scripts/presets/cloth/cotton.py
branches/soc-2010-jwilkins/release/scripts/presets/cloth/denim.py
branches/soc-2010-jwilkins/release/scripts/presets/cloth/leather.py
branches/soc-2010-jwilkins/release/scripts/presets/cloth/rubber.py
branches/soc-2010-jwilkins/release/scripts/presets/cloth/silk.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/DV.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/h264.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/theora.py
branches/soc-2010-jwilkins/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2010-jwilkins/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/soc-2010-jwilkins/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/soc-2010-jwilkins/release/scripts/presets/render/HDTV_1080p.py
branches/soc-2010-jwilkins/release/scripts/presets/render/HDTV_720p.py
branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_1080p.py
branches/soc-2010-jwilkins/release/scripts/presets/render/TV_NTSC_16_colon_9.py
branches/soc-2010-jwilkins/release/scripts/presets/render/TV_NTSC_4_colon_3.py
branches/soc-2010-jwilkins/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/soc-2010-jwilkins/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/apple.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/whole_milk.py
branches/soc-2010-jwilkins/release/scripts/presets/sunsky/classic.py
branches/soc-2010-jwilkins/release/scripts/presets/sunsky/desert.py
branches/soc-2010-jwilkins/release/scripts/presets/sunsky/mountain.py
branches/soc-2010-jwilkins/release/scripts/templates/operator.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_uv.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
branches/soc-2010-jwilkins/release/scripts/ui/space_image.py
branches/soc-2010-jwilkins/release/scripts/ui/space_info.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_node.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/armature.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mball.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sca.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_panel.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_intern.h
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/meshtools.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_snap.c
branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-jwilkins/source/blender/imbuf/intern/divers.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_armature_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2010-jwilkins/source/blender/python/doc/examples/mathutils.Vector.py
branches/soc-2010-jwilkins/source/blender/python/doc/examples/mathutils.py
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/common/npmac.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/Makefile
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2010-jwilkins/source/nan_compile.mk
Added Paths:
-----------
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor_api.c
Removed Paths:
-------------
branches/soc-2010-jwilkins/release/windows/inno/
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-12 18:26:35 UTC (rev 30237)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-12 19:06:01 UTC (rev 30238)
@@ -261,6 +261,7 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
ENDIF(WITH_FFMPEG)
IF(WITH_FFTW3)
@@ -484,7 +485,7 @@
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- # TODO: IF(WITH_LCMS)
+ # TODO: IF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -533,7 +534,7 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+ SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
@@ -560,7 +561,7 @@
SET(GETTEXT_LIB intl)
ENDIF(WITH_INTERNATIONAL)
- SET(JPEG_LIBRARY jpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(PNG_LIBRARIES png)
SET(ZLIB ${LIBDIR}/zlib)
@@ -606,7 +607,7 @@
IF(WITH_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
- SET(OPENEXR_LIB Half IlmImf Iex)
+ SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
@@ -736,6 +737,7 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
ENDIF(WITH_FFMPEG)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
Modified: branches/soc-2010-jwilkins/config/darwin-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/darwin-config.py 2010-07-12 18:26:35 UTC (rev 30237)
+++ branches/soc-2010-jwilkins/config/darwin-config.py 2010-07-12 19:06:01 UTC (rev 30238)
@@ -279,9 +279,9 @@
CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
-CPPFLAGS = ['-fpascal-strings']+ARCH_FLAGS
-CCFLAGS = ['-pipe','-funsigned-char','-fpascal-strings']+ARCH_FLAGS
-CXXFLAGS = ['-pipe','-funsigned-char', '-fpascal-strings']+ARCH_FLAGS
+CPPFLAGS = []+ARCH_FLAGS
+CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
+CXXFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
if WITH_GHOST_COCOA==True:
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
Modified: branches/soc-2010-jwilkins/config/linux2-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/linux2-config.py 2010-07-12 18:26:35 UTC (rev 30237)
+++ branches/soc-2010-jwilkins/config/linux2-config.py 2010-07-12 19:06:01 UTC (rev 30238)
@@ -181,6 +181,9 @@
CPPFLAGS = []
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+if WITH_BF_FFMPEG:
+ # libavutil needs UINT64_C()
+ CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
##BF_DEPEND = True
Modified: branches/soc-2010-jwilkins/extern/glew/include/GL/glew.h
===================================================================
--- branches/soc-2010-jwilkins/extern/glew/include/GL/glew.h 2010-07-12 18:26:35 UTC (rev 30237)
+++ branches/soc-2010-jwilkins/extern/glew/include/GL/glew.h 2010-07-12 19:06:01 UTC (rev 30238)
@@ -2702,7 +2702,7 @@
typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers);
typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURLAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer);
@@ -2723,7 +2723,7 @@
#define glDeleteFramebuffers GLEW_GET_FUN(__glewDeleteFramebuffers)
#define glDeleteRenderbuffers GLEW_GET_FUN(__glewDeleteRenderbuffers)
#define glFramebufferRenderbuffer GLEW_GET_FUN(__glewFramebufferRenderbuffer)
-#define glFramebufferTexturLayer GLEW_GET_FUN(__glewFramebufferTexturLayer)
+#define glFramebufferTextureLayer GLEW_GET_FUN(__glewFramebufferTextureLayer)
#define glFramebufferTexture1D GLEW_GET_FUN(__glewFramebufferTexture1D)
#define glFramebufferTexture2D GLEW_GET_FUN(__glewFramebufferTexture2D)
#define glFramebufferTexture3D GLEW_GET_FUN(__glewFramebufferTexture3D)
@@ -8288,7 +8288,6 @@
typedef void (GLAPIENTRY * PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint* params);
typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
-typedef void (GLAPIENTRY * PFNGLVIDEOPARAMETERIVNVPROC) (GLuint video_slot, GLenum pname, const GLint* params);
#define glGetVideoi64vNV GLEW_GET_FUN(__glewGetVideoi64vNV)
#define glGetVideoivNV GLEW_GET_FUN(__glewGetVideoivNV)
@@ -10563,7 +10562,7 @@
GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers;
GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers;
GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer;
-GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURLAYERPROC __glewFramebufferTexturLayer;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer;
GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D;
GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D;
GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D;
@@ -11612,7 +11611,6 @@
GLEW_FUN_EXPORT PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV;
GLEW_FUN_EXPORT PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV;
GLEW_FUN_EXPORT PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV;
-GLEW_FUN_EXPORT PFNGLVIDEOPARAMETERIVNVPROC __glewVideoParameterivNV;
GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV;
GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV;
Modified: branches/soc-2010-jwilkins/extern/glew/src/glew.c
===================================================================
--- branches/soc-2010-jwilkins/extern/glew/src/glew.c 2010-07-12 18:26:35 UTC (rev 30237)
+++ branches/soc-2010-jwilkins/extern/glew/src/glew.c 2010-07-12 19:06:01 UTC (rev 30238)
@@ -547,7 +547,7 @@
PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers = NULL;
PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers = NULL;
PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer = NULL;
-PFNGLFRAMEBUFFERTEXTURLAYERPROC __glewFramebufferTexturLayer = NULL;
+PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer = NULL;
PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D = NULL;
PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D = NULL;
PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D = NULL;
@@ -1596,7 +1596,6 @@
PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV = NULL;
PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV = NULL;
PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV = NULL;
-PFNGLVIDEOPARAMETERIVNVPROC __glewVideoParameterivNV = NULL;
PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL;
PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL;
@@ -2739,7 +2738,7 @@
r = ((glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffers")) == NULL) || r;
r = ((glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffers")) == NULL) || r;
r = ((glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbuffer")) == NULL) || r;
- r = ((glFramebufferTexturLayer = (PFNGLFRAMEBUFFERTEXTURLAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexturLayer")) == NULL) || r;
+ r = ((glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayer")) == NULL) || r;
r = ((glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1D")) == NULL) || r;
r = ((glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2D")) == NULL) || r;
r = ((glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3D")) == NULL) || r;
@@ -5303,7 +5302,6 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list