[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39989] branches/vgroup_modifiers: Merging r39948 through r39988 from trunk into vgroup_modifiers.

Bastien Montagne montagne29 at wanadoo.fr
Wed Sep 7 07:40:13 CEST 2011 

Revision: 39989
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39989
Author:   mont29
Date:     2011-09-07 05:40:12 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Merging r39948 through r39988 from trunk into vgroup_modifiers.

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

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/build_files/cmake/macros.cmake
    branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
    branches/vgroup_modifiers/doc/python_api/rst/bgl.rst
    branches/vgroup_modifiers/doc/python_api/rst/info_quickstart.rst
    branches/vgroup_modifiers/doc/python_api/rst/info_tips_and_tricks.rst
    branches/vgroup_modifiers/doc/python_api/sphinx_doc_gen.py
    branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_global.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/blender.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/string.c
    branches/vgroup_modifiers/source/blender/blenloader/BLO_sys_types.h
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
    branches/vgroup_modifiers/source/blender/collada/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/collada/DocumentExporter.cpp
    branches/vgroup_modifiers/source/blender/editors/gpencil/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/editors/gpencil/drawgpencil.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_edit.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_intern.h
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_ops.c
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_gpencil.h
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
    branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_header.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform.c
    branches/vgroup_modifiers/source/blender/editors/util/undo.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_internal.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_screen.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_texture.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_texture_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_world.c
    branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_tree.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/vgroup_modifiers/source/blender/nodes/intern/node_socket.c
    branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_tree.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_tree.c
    branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/vgroup_modifiers/source/blender/python/generic/bpy_internal_import.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c
    branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/vgroup_modifiers/source/gameengine/Expressions/ListValue.cpp
    branches/vgroup_modifiers/source/gameengine/Expressions/Value.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_SoundActuator.cpp

Added Paths:
-----------
    branches/vgroup_modifiers/source/blender/collada/SceneExporter.cpp
    branches/vgroup_modifiers/source/blender/collada/SceneExporter.h
    branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_undo.c

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


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39947
   + /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2011-09-07 02:00:44 UTC (rev 39988)
+++ branches/vgroup_modifiers/CMakeLists.txt	2011-09-07 05:40:12 UTC (rev 39989)
@@ -797,7 +797,7 @@
 	else()
 		# keep GCC spesific stuff here
 		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
 			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
 			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)

Modified: branches/vgroup_modifiers/build_files/cmake/macros.cmake
===================================================================
--- branches/vgroup_modifiers/build_files/cmake/macros.cmake	2011-09-07 02:00:44 UTC (rev 39988)
+++ branches/vgroup_modifiers/build_files/cmake/macros.cmake	2011-09-07 05:40:12 UTC (rev 39989)
@@ -392,6 +392,7 @@
 		remove_flag("-Wstrict-prototypes")
 		remove_flag("-Wunused-parameter")
 		remove_flag("-Wwrite-strings")
+		remove_flag("-Wundef")
 		remove_flag("-Wshadow")
 		remove_flag("-Werror=[^ ]+")
 		remove_flag("-Werror")

Modified: branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py	2011-09-07 02:00:44 UTC (rev 39988)
+++ branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py	2011-09-07 05:40:12 UTC (rev 39989)
@@ -174,7 +174,7 @@
 
 CC_WARN = [ '-Wall' ]
 
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32']
 
 PLATFORM_LINKFLAGS = ['--stack,2097152']
 

Modified: branches/vgroup_modifiers/doc/python_api/rst/bgl.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/bgl.rst	2011-09-07 02:00:44 UTC (rev 39988)
+++ branches/vgroup_modifiers/doc/python_api/rst/bgl.rst	2011-09-07 05:40:12 UTC (rev 39989)
@@ -56,9 +56,9 @@
 
    :type n: int
    :arg n: Specifies the number of textures to be queried.
-   :type textures: :class:`Buffer` object I{type GL_INT}
+   :type textures: :class:`bgl.Buffer` object I{type GL_INT}
    :arg textures: Specifies an array containing the names of the textures to be queried
-   :type residences: :class:`Buffer` object I{type GL_INT}(boolean)
+   :type residences: :class:`bgl.Buffer` object I{type GL_INT}(boolean)
    :arg residences: An array in which the texture residence status in returned.
       The residence status of a texture named by an element of textures is
       returned in the corresponding element of residences.
@@ -101,7 +101,7 @@
    :type xmove, ymove: float
    :arg xmove, ymove: Specify the x and y offsets to be added to the current raster position after
       the bitmap is drawn.
-   :type bitmap: :class:`Buffer` object I{type GL_BYTE}
+   :type bitmap: :class:`bgl.Buffer` object I{type GL_BYTE}
    :arg bitmap: Specifies the address of the bitmap image.
 
 
@@ -139,7 +139,7 @@
    :arg n: Specifies the number of display lists to be executed.
    :type type: Enumerated constant
    :arg type: Specifies the type of values in lists.
-   :type lists: :class:`Buffer` object
+   :type lists: :class:`bgl.Buffer` object
    :arg lists: Specifies the address of an array of name offsets in the display list.
       The pointer type is void because the offsets can be bytes, shorts, ints, or floats,
       depending on the value of type.
@@ -217,7 +217,7 @@
 
    :type plane: Enumerated constant
    :arg plane: Specifies which clipping plane is being positioned.
-   :type equation: :class:`Buffer` object I{type GL_FLOAT}(double)
+   :type equation: :class:`bgl.Buffer` object I{type GL_FLOAT}(double)
    :arg equation: Specifies the address of an array of four double- precision
       floating-point values. These values are interpreted as a plane equation.
 
@@ -340,7 +340,7 @@
 
    :type n: int
    :arg n: Specifies the number of textures to be deleted
-   :type textures: :class:`Buffer` I{GL_INT}
+   :type textures: :class:`bgl.Buffer` I{GL_INT}
    :arg textures: Specifies an array of textures to be deleted
 
 
@@ -413,7 +413,7 @@
    :arg format: Specifies the format of the pixel data.
    :type type: Enumerated constant
    :arg type: Specifies the data type for pixels.
-   :type pixels: :class:`Buffer` object
+   :type pixels: :class:`bgl.Buffer` object
    :arg pixels: Specifies a pointer to the pixel data.
 
 
@@ -512,7 +512,7 @@
    :type type: Enumerated constant
    :arg type: Specifies a symbolic constant that describes the information that
       will be returned for each vertex.
-   :type buffer: :class:`Buffer` object I{GL_FLOAT}
+   :type buffer: :class:`bgl.Buffer` object I{GL_FLOAT}
    :arg buffer: Returns the feedback data.
 
 
@@ -592,7 +592,7 @@
 
    :type n: int
    :arg n: Specifies the number of textures name to be generated.
-   :type textures: :class:`Buffer` object I{type GL_INT}
+   :type textures: :class:`bgl.Buffer` object I{type GL_INT}
    :arg textures: Specifies an array in which the generated textures names are stored.
 
 
@@ -620,7 +620,7 @@
    :arg plane: Specifies a clipping plane. The number of clipping planes depends on the
       implementation, but at least six clipping planes are supported. They are identified by
       symbolic names of the form GL_CLIP_PLANEi where 0 < i < GL_MAX_CLIP_PLANES.
-   :type equation:  :class:`Buffer` object I{type GL_FLOAT}
+   :type equation:  :class:`bgl.Buffer` object I{type GL_FLOAT}
    :arg equation:  Returns four float (double)-precision values that are the coefficients of the
       plane equation of plane in eye coordinates. The initial value is (0, 0, 0, 0).
 
@@ -646,7 +646,7 @@
       names of the form GL_LIGHTi where 0 < i < GL_MAX_LIGHTS.
    :type pname: Enumerated constant
    :arg pname: Specifies a light source parameter for light.
-   :type params:  :class:`Buffer` object. Depends on function prototype.
+   :type params:  :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the requested data.
 
 
@@ -662,7 +662,7 @@
    :arg target: Specifies the symbolic name of a map.
    :type query: Enumerated constant
    :arg query: Specifies which parameter to return.
-   :type v: :class:`Buffer` object. Depends on function prototype.
+   :type v: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg v: Returns the requested data.
 
 
@@ -679,7 +679,7 @@
       representing the front and back materials, respectively.
    :type pname: Enumerated constant
    :arg pname: Specifies the material parameter to return.
-   :type params: :class:`Buffer` object. Depends on function prototype.
+   :type params: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the requested data.
 
 
@@ -693,7 +693,7 @@
 
    :type map:  Enumerated constant
    :arg map: Specifies the name of the pixel map to return.
-   :type values: :class:`Buffer` object. Depends on function prototype.
+   :type values: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg values: Returns the pixel map contents.
 
 
@@ -703,7 +703,7 @@
 
    .. seealso:: `OpenGL Docs <http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/getpolygonstipple.html>`_
 
-   :type mask: :class:`Buffer` object I{type GL_BYTE}
+   :type mask: :class:`bgl.Buffer` object I{type GL_BYTE}
    :arg mask: Returns the stipple pattern. The initial value is all 1's.
 
 
@@ -730,7 +730,7 @@
    :arg target: Specifies a texture environment. Must be GL_TEXTURE_ENV.
    :type pname: Enumerated constant
    :arg pname: Specifies the symbolic name of a texture environment parameter.
-   :type params: :class:`Buffer` object. Depends on function prototype.
+   :type params: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the requested data.
 
 
@@ -746,7 +746,7 @@
    :arg coord: Specifies a texture coordinate.
    :type pname: Enumerated constant
    :arg pname: Specifies the symbolic name of the value(s) to be returned.
-   :type params: :class:`Buffer` object. Depends on function prototype.
+   :type params: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the requested data.
 
 
@@ -765,7 +765,7 @@
    :arg format: Specifies a pixel format for the returned data.
    :type type: Enumerated constant
    :arg type: Specifies a pixel type for the returned data.
-   :type pixels: :class:`Buffer` object.
+   :type pixels: :class:`bgl.Buffer` object.
    :arg pixels: Returns the texture image. Should be a pointer to an array of the
       type specified by type
 
@@ -785,7 +785,7 @@
       Level 0 is the base image level. Level n is the nth mipmap reduction image.
    :type pname: Enumerated constant
    :arg pname: Specifies the symbolic name of a texture parameter.
-   :type params: :class:`Buffer` object. Depends on function prototype.
+   :type params: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the requested data.
 
 
@@ -801,7 +801,7 @@
    :arg target: Specifies the symbolic name of the target texture.
    :type pname: Enumerated constant
    :arg pname: Specifies the symbolic name the target texture.
-   :type params: :class:`Buffer` object. Depends on function prototype.
+   :type params: :class:`bgl.Buffer` object. Depends on function prototype.
    :arg params: Returns the texture parameters.
 
 
@@ -826,7 +826,7 @@
 
    .. seealso:: `OpenGL Docs <http://www.opengl.org/documentation/specs/man_pages/hardcopy/GL/html/gl/index_.html>`_
 
-   :type c: :class:`Buffer` object. Depends on function prototype.

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list