[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27228] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 27226 (Blender 2. 5 alpha 2 release point).

Tue Mar 2 22:57:16 CET 2010

Revision: 27228
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27228
Author:   kjym3
Date:     2010-03-02 22:57:16 +0100 (Tue, 02 Mar 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 27226 (Blender 2.5 alpha 2 release point).

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27226

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2008-mxcurioni/release/datafiles/splash.png
    branches/soc-2008-mxcurioni/release/scripts/addons/add_mesh_gears.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.py
    branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
    branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/op/image.py
    branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
    branches/soc-2008-mxcurioni/release/scripts/op/object.py
    branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
    branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
    branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
    branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/op/uv.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/Mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/euler.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/quat.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBuff.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Euler.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Matrix.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Quaternion.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Vector.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.py
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils_euler.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils_matrix.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils_quat.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils_vector.py
    branches/soc-2008-mxcurioni/source/blender/python/generic/BGL.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/BGL.h

Modified: branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================

--- branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2010-03-02 20:58:57 UTC (rev 27227)
+++ branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2010-03-02 21:57:16 UTC (rev 27228)
@@ -895,7 +895,7 @@
 		{
 			AUD_Specs specs = h->reader->getSpecs();
 			position += (h->reader->getPosition() - m_buffersize *
-									AUD_OPENAL_CYCLE_BUFFERS / specs.channels) /
+									AUD_OPENAL_CYCLE_BUFFERS) /
 					   (float)specs.rate;
 		}
 	}

Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2010-03-02 20:58:57 UTC (rev 27227)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2010-03-02 21:57:16 UTC (rev 27228)
@@ -372,6 +372,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\python\intern\bpy_rna_callback.c"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\python\intern\bpy_util.c"
 					>
 				</File>
@@ -384,10 +388,14 @@
 				Name="generic"
 				>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\BGL.c"
+					RelativePath="..\..\..\source\blender\python\generic\bgl.c"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\python\generic\blf.c"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\python\generic\bpy_internal_import.c"
 					>
 				</File>
@@ -426,10 +434,6 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\..\source\blender\python\generic\BGL.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\source\blender\python\BPY_extern.h"
 				>
 			</File>
@@ -477,6 +481,50 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="generic"
+				>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\bgl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\blf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\bpy_internal_import.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\euler.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\Geometry.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\IDProp.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\Mathutils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\matrix.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\quat.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\vector.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj	2010-03-02 20:58:57 UTC (rev 27227)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj	2010-03-02 21:57:16 UTC (rev 27228)
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -196,7 +196,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -272,7 +272,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -347,7 +347,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -423,7 +423,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\blender\gpu;..\..\..\..\build\msvc_9\intern\ghost\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: branches/soc-2008-mxcurioni/release/datafiles/splash.png
===================================================================
(Binary files differ)

Modified: branches/soc-2008-mxcurioni/release/scripts/addons/add_mesh_gears.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/addons/add_mesh_gears.py	2010-03-02 20:58:57 UTC (rev 27227)
+++ branches/soc-2008-mxcurioni/release/scripts/addons/add_mesh_gears.py	2010-03-02 21:57:16 UTC (rev 27228)
@@ -259,8 +259,7 @@
     '''Add a gear mesh.'''
     bl_idname = "mesh.gear_add"
     bl_label = "Add Gear"
-    bl_register = True
-    bl_undo = True

@@ Diff output truncated at 10240 characters. @@


