[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37128] branches/soc-2011-tomato: Merging r37010 through r37122 from trunk into tomato.
Sergey Sharybin
g.ulairi at gmail.com
Fri Jun 3 16:54:37 CEST 2011
Revision: 37128
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37128
Author: nazgul
Date: 2011-06-03 14:54:37 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Merging r37010 through r37122 from trunk into tomato.
Manually resolved conflict in startup.blend.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37010
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37122
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
branches/soc-2011-tomato/extern/glew/CMakeLists.txt
branches/soc-2011-tomato/extern/glew/include/GL/glew.h
branches/soc-2011-tomato/extern/glew/include/GL/glxew.h
branches/soc-2011-tomato/extern/glew/include/GL/wglew.h
branches/soc-2011-tomato/extern/glew/src/glew.c
branches/soc-2011-tomato/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-tomato/extern/libredcode/CMakeLists.txt
branches/soc-2011-tomato/extern/lzma/CMakeLists.txt
branches/soc-2011-tomato/extern/lzo/CMakeLists.txt
branches/soc-2011-tomato/intern/audaspace/CMakeLists.txt
branches/soc-2011-tomato/intern/boolop/CMakeLists.txt
branches/soc-2011-tomato/intern/bsp/CMakeLists.txt
branches/soc-2011-tomato/intern/container/CMakeLists.txt
branches/soc-2011-tomato/intern/decimation/CMakeLists.txt
branches/soc-2011-tomato/intern/elbeem/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/guardedalloc/CMakeLists.txt
branches/soc-2011-tomato/intern/iksolver/CMakeLists.txt
branches/soc-2011-tomato/intern/itasc/CMakeLists.txt
branches/soc-2011-tomato/intern/memutil/CMakeLists.txt
branches/soc-2011-tomato/intern/mikktspace/CMakeLists.txt
branches/soc-2011-tomato/intern/moto/CMakeLists.txt
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/intern/smoke/CMakeLists.txt
branches/soc-2011-tomato/intern/string/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-tomato/source/blender/avi/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-tomato/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-tomato/source/blender/nodes/intern/SHD_util.h
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.h
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.h
branches/soc-2011-tomato/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-tomato/source/blender/windowmanager/SConscript
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/VideoTexture/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-37009
+ /trunk/blender:36831-37122
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-06-03 14:54:37 UTC (rev 37128)
@@ -13,7 +13,16 @@
include_directories(${all_incs})
endmacro()
+macro(blender_include_dirs_sys
+ includes)
+ foreach(inc ${ARGV})
+ get_filename_component(abs_inc ${inc} ABSOLUTE)
+ list(APPEND all_incs ${abs_inc})
+ endforeach()
+ include_directories(SYSTEM ${all_incs})
+endmacro()
+
macro(blender_source_group
sources)
@@ -35,12 +44,15 @@
macro(blender_add_lib_nolist
name
sources
- includes)
+ includes
+ includes_sys)
# message(STATUS "Configuring library ${name}")
# include_directories(${includes})
+ # include_directories(SYSTEM ${includes_sys})
blender_include_dirs("${includes}")
+ blender_include_dirs_sys("${includes_sys}")
add_library(${name} ${sources})
@@ -54,9 +66,10 @@
macro(blender_add_lib
name
sources
- includes)
+ includes
+ includes_sys)
- blender_add_lib_nolist(${name} "${sources}" "${includes}")
+ blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
endmacro()
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-06-03 14:54:37 UTC (rev 37128)
@@ -605,9 +605,12 @@
doneroot = False
rootdirconts = []
datafiles = ''
+ deldatafiles = ''
+ deldatadirs = ''
l = len(bf_installdir)
for dp,dn,df in os.walk(bf_installdir):
+ # install
if not doneroot:
for f in df:
rootdirconts.append(os.path.join(dp,f))
@@ -621,6 +624,16 @@
outfile = os.path.join(dp,f)
datafiles += ' File '+outfile + "\n"
+ # uninstall
+ deldir = dp[l+1:]
+
+ if len(deldir)>0:
+ deldatadirs = "RMDir $INSTDIR\\" + deldir + "\n" + deldatadirs
+ deldatadirs = "RMDir /r $INSTDIR\\" + deldir + "\\__pycache__\n" + deldatadirs
+
+ for f in df:
+ deldatafiles += 'Delete \"$INSTDIR\\' + os.path.join(deldir, f) + "\"\n"
+
#### change to suit install dir ####
inst_dir = install_base_dir + env['BF_INSTALLDIR']
@@ -657,6 +670,8 @@
ns_cnt = string.replace(ns_cnt, "[DELROOTDIRCONTS]", delrootstring)
ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles)
+ ns_cnt = string.replace(ns_cnt, "[DELDATAFILES]", deldatafiles)
+ ns_cnt = string.replace(ns_cnt, "[DELDATADIRS]", deldatadirs)
tmpnsi = os.path.normpath(install_base_dir+os.sep+env['BF_BUILDDIR']+os.sep+"00.blender_tmp.nsi")
new_nsis = open(tmpnsi, 'w')
Modified: branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt 2011-06-03 14:54:37 UTC (rev 37128)
@@ -18,17 +18,21 @@
# All rights reserved.
#
+set(INC
+ ./include
+)
+
+set(INC_SYS
+
+)
+
set(SRC
binreloc.c
include/binreloc.h
)
-set(INC
- ./include
-)
-
add_definitions(-DENABLE_BINRELOC)
-blender_add_lib(extern_binreloc "${SRC}" "${INC}")
+blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2011-06-03 14:54:37 UTC (rev 37128)
@@ -29,6 +29,10 @@
src
)
+set(INC_SYS
+
+)
+
set(SRC
src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -145,7 +149,6 @@
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
-
src/Bullet-C-Api.h
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -330,4 +333,4 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
-blender_add_lib(extern_bullet "${SRC}" "${INC}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2011-06-03 14:54:37 UTC (rev 37128)
@@ -33,6 +33,10 @@
eltopo3d
)
+set(INC_SYS
+
+)
+
set(SRC
eltopo-capi.cpp
common/bfstream.cpp
@@ -122,4 +126,4 @@
add_definitions(-DNOGUI)
add_definitions(-DUSE_FORTRAN_BLAS)
-blender_add_lib(extern_eltopo "${SRC}" "${INC}")
+blender_add_lib(extern_eltopo "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/glew/CMakeLists.txt 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/extern/glew/CMakeLists.txt 2011-06-03 14:54:37 UTC (rev 37128)
@@ -28,8 +28,12 @@
./include
)
+set(INC_SYS
+
+)
+
if(UNIX)
- list(APPEND INC ${X11_X11_INCLUDE_PATH})
+ list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
endif()
set(SRC
@@ -42,4 +46,4 @@
add_definitions(-DGLEW_STATIC)
-blender_add_lib(extern_glew "${SRC}" "${INC}")
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/extern/glew/include/GL/glew.h
===================================================================
--- branches/soc-2011-tomato/extern/glew/include/GL/glew.h 2011-06-03 14:49:18 UTC (rev 37127)
+++ branches/soc-2011-tomato/extern/glew/include/GL/glew.h 2011-06-03 14:54:37 UTC (rev 37128)
@@ -1158,11 +1158,13 @@
/* ---------------------------------- GLU ---------------------------------- */
+#ifndef GLEW_NO_GLU
/* this is where we can safely include GLU */
-#if defined(__APPLE__) && defined(__MACH__)
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
+# if defined(__APPLE__) && defined(__MACH__)
+# include <OpenGL/glu.h>
+# else
+# include <GL/glu.h>
+# endif
#endif
/* ----------------------------- GL_VERSION_1_2 ---------------------------- */
@@ -2445,6 +2447,18 @@
#endif /* GL_3DFX_texture_compression_FXT1 */
+/* ----------------------- GL_AMD_blend_minmax_factor ---------------------- */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+
+#define GL_FACTOR_MIN_AMD 0x901C
+#define GL_FACTOR_MAX_AMD 0x901D
+
+#define GLEW_AMD_blend_minmax_factor GLEW_GET_VAR(__GLEW_AMD_blend_minmax_factor)
+
+#endif /* GL_AMD_blend_minmax_factor */
+
/* ----------------------- GL_AMD_conservative_depth ----------------------- */
#ifndef GL_AMD_conservative_depth
@@ -2587,6 +2601,21 @@
#endif /* GL_AMD_performance_monitor */
+/* ------------------------ GL_AMD_sample_positions ------------------------ */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+
+#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F
+
+typedef void (GLAPIENTRY * PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat* val);
+
+#define glSetMultisamplefvAMD GLEW_GET_FUN(__glewSetMultisamplefvAMD)
+
+#define GLEW_AMD_sample_positions GLEW_GET_VAR(__GLEW_AMD_sample_positions)
+
+#endif /* GL_AMD_sample_positions */
+
/* ------------------ GL_AMD_seamless_cubemap_per_texture ------------------ */
#ifndef GL_AMD_seamless_cubemap_per_texture
@@ -3262,12 +3291,6 @@
#ifndef GL_ARB_draw_instanced
#define GL_ARB_draw_instanced 1
-typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount);
-
-#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB)
-#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB)
-
#define GLEW_ARB_draw_instanced GLEW_GET_VAR(__GLEW_ARB_draw_instanced)
#endif /* GL_ARB_draw_instanced */
@@ -3827,8 +3850,12 @@
#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount);
typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB)
+#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB)
#define glVertexAttribDivisorARB GLEW_GET_FUN(__glewVertexAttribDivisorARB)
#define GLEW_ARB_instanced_arrays GLEW_GET_VAR(__GLEW_ARB_instanced_arrays)
@@ -6211,8 +6238,8 @@
typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-#define glPNTrianglesfATI GLEW_GET_FUN(__glPNTrianglewesfATI)
-#define glPNTrianglesiATI GLEW_GET_FUN(__glPNTrianglewesiATI)
+#define glPNTrianglesfATI GLEW_GET_FUN(__glewPNTrianglesfATI)
+#define glPNTrianglesiATI GLEW_GET_FUN(__glewPNTrianglesiATI)
#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles)
@@ -7599,12 +7626,10 @@
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list