[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43370] branches/carve_booleans: Merging r43290 through r43368 from trunk into carve_booleans

Sergey Sharybin sergey.vfx at gmail.com
Sat Jan 14 11:11:26 CET 2012


Revision: 43370
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43370
Author:   nazgul
Date:     2012-01-14 10:11:22 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Merging r43290 through r43368 from trunk into carve_booleans

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43290
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43368

Modified Paths:
--------------
    branches/carve_booleans/CMakeLists.txt
    branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.1.py
    branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.py
    branches/carve_booleans/doc/python_api/examples/bpy.types.Panel.1.py
    branches/carve_booleans/doc/python_api/rst/bge.texture.rst
    branches/carve_booleans/doc/python_api/rst/bge.types.rst
    branches/carve_booleans/doc/python_api/rst/info_best_practice.rst
    branches/carve_booleans/doc/python_api/rst/info_overview.rst
    branches/carve_booleans/doc/python_api/rst/info_quickstart.rst
    branches/carve_booleans/doc/python_api/rst/info_tips_and_tricks.rst
    branches/carve_booleans/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
    branches/carve_booleans/extern/libmv/third_party/glog/src/utilities.cc
    branches/carve_booleans/intern/cycles/blender/blender_object.cpp
    branches/carve_booleans/intern/cycles/kernel/svm/svm_musgrave.h
    branches/carve_booleans/intern/ghost/GHOST_ISystem.h
    branches/carve_booleans/intern/ghost/intern/GHOST_System.cpp
    branches/carve_booleans/intern/ghost/intern/GHOST_System.h
    branches/carve_booleans/release/scripts/presets/ffmpeg/DV.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/DVD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/SVCD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/VCD.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/h264.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/theora.py
    branches/carve_booleans/release/scripts/presets/ffmpeg/xvid.py
    branches/carve_booleans/release/scripts/presets/keyconfig/maya.py
    branches/carve_booleans/release/scripts/startup/bl_operators/wm.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_game.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_render.py
    branches/carve_booleans/release/scripts/startup/bl_ui/properties_scene.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_graph.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_image.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_info.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_nla.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_time.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/carve_booleans/source/blender/blenkernel/BKE_blender.h
    branches/carve_booleans/source/blender/blenkernel/BKE_brush.h
    branches/carve_booleans/source/blender/blenkernel/BKE_writeavi.h
    branches/carve_booleans/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/carve_booleans/source/blender/blenkernel/BKE_writeframeserver.h
    branches/carve_booleans/source/blender/blenkernel/intern/brush.c
    branches/carve_booleans/source/blender/blenkernel/intern/displist.c
    branches/carve_booleans/source/blender/blenkernel/intern/image.c
    branches/carve_booleans/source/blender/blenkernel/intern/node.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeavi.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeffmpeg.c
    branches/carve_booleans/source/blender/blenkernel/intern/writeframeserver.c
    branches/carve_booleans/source/blender/blenlib/BLI_editVert.h
    branches/carve_booleans/source/blender/blenlib/BLI_fnmatch.h
    branches/carve_booleans/source/blender/blenlib/intern/boxpack2d.c
    branches/carve_booleans/source/blender/blenlib/intern/fileops.c
    branches/carve_booleans/source/blender/blenlib/intern/path_util.c
    branches/carve_booleans/source/blender/blenloader/intern/readfile.c
    branches/carve_booleans/source/blender/editors/armature/armature_intern.h
    branches/carve_booleans/source/blender/editors/armature/armature_ops.c
    branches/carve_booleans/source/blender/editors/armature/editarmature.c
    branches/carve_booleans/source/blender/editors/curve/curve_intern.h
    branches/carve_booleans/source/blender/editors/curve/curve_ops.c
    branches/carve_booleans/source/blender/editors/curve/editcurve.c
    branches/carve_booleans/source/blender/editors/curve/editfont.c
    branches/carve_booleans/source/blender/editors/include/ED_image.h
    branches/carve_booleans/source/blender/editors/interface/interface.c
    branches/carve_booleans/source/blender/editors/interface/interface_handlers.c
    branches/carve_booleans/source/blender/editors/interface/interface_intern.h
    branches/carve_booleans/source/blender/editors/interface/interface_layout.c
    branches/carve_booleans/source/blender/editors/interface/interface_regions.c
    branches/carve_booleans/source/blender/editors/interface/interface_templates.c
    branches/carve_booleans/source/blender/editors/interface/interface_widgets.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh_mods.c
    branches/carve_booleans/source/blender/editors/mesh/editmesh_tools.c
    branches/carve_booleans/source/blender/editors/mesh/mesh_data.c
    branches/carve_booleans/source/blender/editors/mesh/mesh_intern.h
    branches/carve_booleans/source/blender/editors/mesh/mesh_ops.c
    branches/carve_booleans/source/blender/editors/metaball/mball_edit.c
    branches/carve_booleans/source/blender/editors/metaball/mball_intern.h
    branches/carve_booleans/source/blender/editors/metaball/mball_ops.c
    branches/carve_booleans/source/blender/editors/object/object_add.c
    branches/carve_booleans/source/blender/editors/object/object_constraint.c
    branches/carve_booleans/source/blender/editors/object/object_edit.c
    branches/carve_booleans/source/blender/editors/object/object_intern.h
    branches/carve_booleans/source/blender/editors/object/object_modifier.c
    branches/carve_booleans/source/blender/editors/object/object_ops.c
    branches/carve_booleans/source/blender/editors/object/object_relations.c
    branches/carve_booleans/source/blender/editors/object/object_select.c
    branches/carve_booleans/source/blender/editors/object/object_transform.c
    branches/carve_booleans/source/blender/editors/physics/particle_edit.c
    branches/carve_booleans/source/blender/editors/physics/physics_fluid.c
    branches/carve_booleans/source/blender/editors/physics/physics_intern.h
    branches/carve_booleans/source/blender/editors/physics/physics_ops.c
    branches/carve_booleans/source/blender/editors/render/render_internal.c
    branches/carve_booleans/source/blender/editors/render/render_opengl.c
    branches/carve_booleans/source/blender/editors/render/render_preview.c
    branches/carve_booleans/source/blender/editors/render/render_shading.c
    branches/carve_booleans/source/blender/editors/screen/screen_edit.c
    branches/carve_booleans/source/blender/editors/screen/screen_ops.c
    branches/carve_booleans/source/blender/editors/screen/screendump.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_image.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt.c
    branches/carve_booleans/source/blender/editors/sound/sound_ops.c
    branches/carve_booleans/source/blender/editors/space_buttons/buttons_ops.c
    branches/carve_booleans/source/blender/editors/space_clip/clip_ops.c
    branches/carve_booleans/source/blender/editors/space_console/console_ops.c
    branches/carve_booleans/source/blender/editors/space_file/filesel.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_select.c
    branches/carve_booleans/source/blender/editors/space_image/image_draw.c
    branches/carve_booleans/source/blender/editors/space_image/image_intern.h
    branches/carve_booleans/source/blender/editors/space_image/image_ops.c
    branches/carve_booleans/source/blender/editors/space_image/space_image.c
    branches/carve_booleans/source/blender/editors/space_logic/logic_ops.c
    branches/carve_booleans/source/blender/editors/space_node/drawnode.c
    branches/carve_booleans/source/blender/editors/space_node/node_edit.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_draw.c
    branches/carve_booleans/source/blender/editors/space_outliner/outliner_tree.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_add.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_select.c
    branches/carve_booleans/source/blender/editors/space_text/text_ops.c
    branches/carve_booleans/source/blender/editors/space_view3d/drawobject.c
    branches/carve_booleans/source/blender/editors/space_view3d/space_view3d.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_buttons.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_edit.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/carve_booleans/source/blender/editors/transform/transform.c
    branches/carve_booleans/source/blender/editors/transform/transform_conversions.c
    branches/carve_booleans/source/blender/editors/transform/transform_generics.c
    branches/carve_booleans/source/blender/editors/transform/transform_ops.c
    branches/carve_booleans/source/blender/editors/transform/transform_snap.c
    branches/carve_booleans/source/blender/editors/util/undo.c
    branches/carve_booleans/source/blender/editors/uvedit/uvedit_ops.c
    branches/carve_booleans/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/carve_booleans/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/carve_booleans/source/blender/imbuf/intern/indexer.c
    branches/carve_booleans/source/blender/imbuf/intern/tiff.c
    branches/carve_booleans/source/blender/makesdna/DNA_ID.h
    branches/carve_booleans/source/blender/makesdna/DNA_action_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_scene_types.h
    branches/carve_booleans/source/blender/makesrna/RNA_access.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_access.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_brush.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_image.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_object.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_scene.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_userdef.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_wm.c
    branches/carve_booleans/source/blender/nodes/NOD_composite.h
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/carve_booleans/source/blender/python/intern/bpy_props.c
    branches/carve_booleans/source/blender/python/intern/bpy_rna.c
    branches/carve_booleans/source/blender/quicktime/apple/qtkit_export.m
    branches/carve_booleans/source/blender/render/intern/source/convertblender.c
    branches/carve_booleans/source/blender/render/intern/source/pipeline.c
    branches/carve_booleans/source/blender/render/intern/source/zbuf.c
    branches/carve_booleans/source/blender/windowmanager/WM_api.h
    branches/carve_booleans/source/blender/windowmanager/intern/wm_event_system.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_init_exit.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_keymap.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_operators.c
    branches/carve_booleans/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/carve_booleans/source/gameengine/Ketsji/KX_PythonInit.cpp

Property Changed:
----------------
    branches/carve_booleans/
    branches/carve_booleans/source/blender/editors/space_outliner/


Property changes on: branches/carve_booleans
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:40001-42622,42663-43289
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:40001-42622,42663-43368

Modified: branches/carve_booleans/CMakeLists.txt
===================================================================
--- branches/carve_booleans/CMakeLists.txt	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/CMakeLists.txt	2012-01-14 10:11:22 UTC (rev 43370)
@@ -468,7 +468,8 @@
 		# use lib dir if available and nothing else specified
 		if(LIBDIR AND NOT FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
-			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+			# XXX, some distros might need 'theoraenc theoradec' too
+			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
 		else()
 			set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
 			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -626,6 +627,10 @@
 	# CLang is the same as GCC for now.
 	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# Solaris CC
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") 
+		set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
+		
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken

Modified: branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.1.py
===================================================================
--- branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.1.py	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.1.py	2012-01-14 10:11:22 UTC (rev 43370)
@@ -13,8 +13,8 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("object.select_all", text="Select/Deselect All")
-        layout.operator("object.select_inverse", text="Inverse")
+        layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE'
+        layout.operator("object.select_all", text="Inverse").action = 'INVERT'
         layout.operator("object.select_random", text="Random")
 
         # access this operator as a submenu

Modified: branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.py
===================================================================
--- branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.py	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/doc/python_api/examples/bpy.types.Menu.py	2012-01-14 10:11:22 UTC (rev 43370)
@@ -27,8 +27,8 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("object.select_all", text="Select/Deselect All")
-        layout.operator("object.select_inverse", text="Inverse")
+        layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE'
+        layout.operator("object.select_all", text="Inverse").action = 'INVERT'
         layout.operator("object.select_random", text="Random")
 
 

Modified: branches/carve_booleans/doc/python_api/examples/bpy.types.Panel.1.py
===================================================================
--- branches/carve_booleans/doc/python_api/examples/bpy.types.Panel.1.py	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/doc/python_api/examples/bpy.types.Panel.1.py	2012-01-14 10:11:22 UTC (rev 43370)
@@ -34,9 +34,9 @@
 
         box = layout.box()
         box.label("Selection Tools")
-        box.operator("object.select_all")
+        box.operator("object.select_all").action = 'TOGGLE'
         row = box.row()
-        row.operator("object.select_inverse")
+        row.operator("object.select_all").action = 'INVERT'
         row.operator("object.select_random")
 
 

Modified: branches/carve_booleans/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/carve_booleans/doc/python_api/rst/bge.texture.rst	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/doc/python_api/rst/bge.texture.rst	2012-01-14 10:11:22 UTC (rev 43370)
@@ -516,7 +516,7 @@
       line by line starting from the bottom of the image. The pixel size and format is determined by the mode
       parameter.
 
-.. function materialID(object,name)
+.. function:: materialID(object,name)
 
    Returns a numeric value that can be used in :class:`Texture` to create a dynamic texture.
 
@@ -538,7 +538,7 @@
    :type name: string
    :rtype: integer
 
-.. function setLogFile(filename)
+.. function:: setLogFile(filename)
 
    Sets the name of a text file in which runtime error messages will be written, in addition to the printing
    of the messages on the Python console. Only the runtime errors specific to the VideoTexture module

Modified: branches/carve_booleans/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/carve_booleans/doc/python_api/rst/bge.types.rst	2012-01-14 10:08:47 UTC (rev 43369)
+++ branches/carve_booleans/doc/python_api/rst/bge.types.rst	2012-01-14 10:11:22 UTC (rev 43370)
@@ -1765,33 +1765,29 @@
       #. Polygon shape (triangle/quad)
       #. Game Object
 
-   #. Verticies will be split by face if necessary.  Verticies can only be shared between faces if:
+   #. Vertices will be split by face if necessary.  Vertices can only be shared between faces if:
 
       #. They are at the same position
       #. UV coordinates are the same
       #. Their normals are the same (both polygons are "Set Smooth")
-      #. They are the same colour, for example: a cube has 24 verticies: 6 faces with 4 verticies per face.
+      #. They are the same colour, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
 
    The correct method of iterating over every :class:`KX_VertexProxy` in a game object
    
    .. code-block:: python
 
-      import GameLogic
+      from bge import logic
 
-      co = GameLogic.getCurrentController()
-      obj = co.owner
+      cont = logic.getCurrentController()
+      object = cont.owner
 
-      m_i = 0
-      mesh = obj.getMesh(m_i) # There can be more than one mesh...
-      while mesh != None:
-         for mat in range(mesh.getNumMaterials()):
+      for mesh in object.meshes:
+         for material in mesh.materials:
             for v_index in range(mesh.getVertexArrayLength(mat)):
                vertex = mesh.getVertex(mat, v_index)
                # Do something with vertex here...
                # ... eg: colour the vertex red.
                vertex.colour = [1.0, 0.0, 0.0, 1.0]
-         m_i += 1
-         mesh = obj.getMesh(m_i)
 
    .. attribute:: materials
 
@@ -2401,136 +2397,54 @@
 
       Some of the methods/variables are CObjects.  If you mix these up, you will crash blender.
 
-   This example requires `PyOpenGL <http://pyopengl.sourceforge.net>`_ and `GLEWPy <http://glewpy.sourceforge.net>`_
-
    .. code-block:: python
 
-      import GameLogic
-      import OpenGL
-      from OpenGL.GL import *
-      from OpenGL.GLU import *
-      import glew
-      from glew import *
+      from bge import logic
       
-      glewInit()
-      
       vertex_shader = """
       
       void main(void)
       {
+         // original vertex position, no changes
          gl_Position = ftransform();
+         // coordinate of the 1st texture channel
+         gl_TexCoord[0] = gl_MultiTexCoord0;
+         // coordinate of the 2nd texture channel
+         gl_TexCoord[1] = gl_MultiTexCoord1;
       }
       """
       
       fragment_shader ="""
-      
+
+      uniform sampler2D color_0;
+      uniform sampler2D color_1;
+      uniform float factor;
+
       void main(void)
       {
-         gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+         vec4 color_0 = texture2D(color_0, gl_TexCoord[0].st);
+         vec4 color_1 = texture2D(color_1, gl_TexCoord[1].st);
+         gl_FragColor = mix(color_0, color_1, factor);
       }
       """
-      
-      class MyMaterial:
-         def __init__(self):
-            self.pass_no = 0
-            # Create a shader
-            self.m_program = glCreateProgramObjectARB()
-            # Compile the vertex shader
-            self.shader(GL_VERTEX_SHADER_ARB, (vertex_shader))
-            # Compile the fragment shader
-            self.shader(GL_FRAGMENT_SHADER_ARB, (fragment_shader))
-            # Link the shaders together
-            self.link()
-            
-         def PrintInfoLog(self, tag, object):
-            """
-            PrintInfoLog prints the GLSL compiler log
-            """
-            print "Tag:    def PrintGLError(self, tag = ""):
-            
-         def PrintGLError(self, tag = ""):
-            """
-            Prints the current GL error status
-            """
-            if len(tag):
-               print tag
-            err = glGetError()
-            if err != GL_NO_ERROR:
-               print "GL Error: %s\\n"%(gluErrorString(err))
-      
-         def shader(self, type, shaders):
-            """
-            shader compiles a GLSL shader and attaches it to the current
-            program.
-            
-            type should be either GL_VERTEX_SHADER_ARB or GL_FRAGMENT_SHADER_ARB
-            shaders should be a sequence of shader source to compile.
-            """
-            # Create a shader object
-            shader_object = glCreateShaderObjectARB(type)
-      
-            # Add the source code

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list