[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28203] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28181 :28201

Brecht Van Lommel brecht at blender.org
Thu Apr 15 12:30:02 CEST 2010


Revision: 28203
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28203
Author:   blendix
Date:     2010-04-15 12:30:02 +0200 (Thu, 15 Apr 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28181:28201

Modified Paths:
--------------
    branches/render25/intern/guardedalloc/intern/mallocn.c
    branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/render25/projectfiles_vc9/blender/blender.sln
    branches/render25/projectfiles_vc9/blender/blender.vcproj
    branches/render25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/render25/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/render25/release/datafiles/splash.png
    branches/render25/release/scripts/modules/bpy_types.py
    branches/render25/release/scripts/op/presets.py
    branches/render25/release/scripts/ui/properties_data_lamp.py
    branches/render25/release/scripts/ui/properties_material.py
    branches/render25/release/scripts/ui/properties_physics_cloth.py
    branches/render25/release/scripts/ui/properties_render.py
    branches/render25/release/scripts/ui/space_node.py
    branches/render25/release/scripts/ui/space_userpref.py
    branches/render25/source/blender/blenkernel/BKE_object.h
    branches/render25/source/blender/blenkernel/BKE_pointcache.h
    branches/render25/source/blender/blenkernel/BKE_utildefines.h
    branches/render25/source/blender/blenkernel/intern/action.c
    branches/render25/source/blender/blenkernel/intern/image.c
    branches/render25/source/blender/blenkernel/intern/modifier.c
    branches/render25/source/blender/blenkernel/intern/object.c
    branches/render25/source/blender/blenkernel/intern/pointcache.c
    branches/render25/source/blender/blenkernel/intern/scene.c
    branches/render25/source/blender/blenkernel/intern/texture.c
    branches/render25/source/blender/blenlib/BLI_math_vector.h
    branches/render25/source/blender/blenlib/BLI_uvproject.h
    branches/render25/source/blender/blenlib/intern/uvproject.c
    branches/render25/source/blender/blenloader/intern/readfile.c
    branches/render25/source/blender/editors/armature/editarmature.c
    branches/render25/source/blender/editors/datafiles/splash.png.c
    branches/render25/source/blender/editors/interface/interface_templates.c
    branches/render25/source/blender/editors/object/object_transform.c
    branches/render25/source/blender/editors/physics/particle_edit.c
    branches/render25/source/blender/editors/render/render_internal.c
    branches/render25/source/blender/editors/space_node/node_edit.c
    branches/render25/source/blender/gpu/SConscript
    branches/render25/source/blender/gpu/intern/gpu_extensions.c
    branches/render25/source/blender/makesdna/DNA_camera_types.h
    branches/render25/source/blender/makesdna/DNA_scene_types.h
    branches/render25/source/blender/makesdna/DNA_space_types.h
    branches/render25/source/blender/makesdna/DNA_windowmanager_types.h
    branches/render25/source/blender/makesrna/intern/rna_animation_api.c
    branches/render25/source/blender/makesrna/intern/rna_animviz.c
    branches/render25/source/blender/makesrna/intern/rna_armature.c
    branches/render25/source/blender/makesrna/intern/rna_armature_api.c
    branches/render25/source/blender/makesrna/intern/rna_boid.c
    branches/render25/source/blender/makesrna/intern/rna_brush.c
    branches/render25/source/blender/makesrna/intern/rna_camera.c
    branches/render25/source/blender/makesrna/intern/rna_cloth.c
    branches/render25/source/blender/makesrna/intern/rna_color.c
    branches/render25/source/blender/makesrna/intern/rna_constraint.c
    branches/render25/source/blender/makesrna/intern/rna_context.c
    branches/render25/source/blender/makesrna/intern/rna_controller.c
    branches/render25/source/blender/makesrna/intern/rna_define.c
    branches/render25/source/blender/makesrna/intern/rna_fcurve_api.c
    branches/render25/source/blender/makesrna/intern/rna_fluidsim.c
    branches/render25/source/blender/makesrna/intern/rna_gpencil.c
    branches/render25/source/blender/makesrna/intern/rna_group.c
    branches/render25/source/blender/makesrna/intern/rna_image.c
    branches/render25/source/blender/makesrna/intern/rna_image_api.c
    branches/render25/source/blender/makesrna/intern/rna_key.c
    branches/render25/source/blender/makesrna/intern/rna_lamp.c
    branches/render25/source/blender/makesrna/intern/rna_lattice.c
    branches/render25/source/blender/makesrna/intern/rna_main.c
    branches/render25/source/blender/makesrna/intern/rna_main_api.c
    branches/render25/source/blender/makesrna/intern/rna_material.c
    branches/render25/source/blender/makesrna/intern/rna_material_api.c
    branches/render25/source/blender/makesrna/intern/rna_mesh.c
    branches/render25/source/blender/makesrna/intern/rna_mesh_api.c
    branches/render25/source/blender/makesrna/intern/rna_meta.c
    branches/render25/source/blender/makesrna/intern/rna_modifier.c
    branches/render25/source/blender/makesrna/intern/rna_nla.c
    branches/render25/source/blender/makesrna/intern/rna_nodetree.c
    branches/render25/source/blender/makesrna/intern/rna_object.c
    branches/render25/source/blender/makesrna/intern/rna_object_api.c
    branches/render25/source/blender/makesrna/intern/rna_object_force.c
    branches/render25/source/blender/makesrna/intern/rna_packedfile.c
    branches/render25/source/blender/makesrna/intern/rna_particle.c
    branches/render25/source/blender/makesrna/intern/rna_pose.c
    branches/render25/source/blender/makesrna/intern/rna_pose_api.c
    branches/render25/source/blender/makesrna/intern/rna_property.c
    branches/render25/source/blender/makesrna/intern/rna_render.c
    branches/render25/source/blender/makesrna/intern/rna_rna.c
    branches/render25/source/blender/makesrna/intern/rna_scene.c
    branches/render25/source/blender/makesrna/intern/rna_scene_api.c
    branches/render25/source/blender/makesrna/intern/rna_screen.c
    branches/render25/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/render25/source/blender/makesrna/intern/rna_sensor.c
    branches/render25/source/blender/makesrna/intern/rna_sequencer.c
    branches/render25/source/blender/makesrna/intern/rna_smoke.c
    branches/render25/source/blender/makesrna/intern/rna_sound.c
    branches/render25/source/blender/makesrna/intern/rna_space.c
    branches/render25/source/blender/makesrna/intern/rna_test.c
    branches/render25/source/blender/makesrna/intern/rna_text.c
    branches/render25/source/blender/makesrna/intern/rna_text_api.c
    branches/render25/source/blender/makesrna/intern/rna_texture.c
    branches/render25/source/blender/makesrna/intern/rna_timeline.c
    branches/render25/source/blender/makesrna/intern/rna_ui.c
    branches/render25/source/blender/makesrna/intern/rna_ui_api.c
    branches/render25/source/blender/makesrna/intern/rna_userdef.c
    branches/render25/source/blender/makesrna/intern/rna_vfont.c
    branches/render25/source/blender/makesrna/intern/rna_wm.c
    branches/render25/source/blender/makesrna/intern/rna_wm_api.c
    branches/render25/source/blender/makesrna/intern/rna_world.c
    branches/render25/source/blender/render/intern/source/pipeline.c
    branches/render25/source/blender/windowmanager/WM_api.h
    branches/render25/source/blender/windowmanager/intern/wm.c
    branches/render25/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/render25/source/blender/windowmanager/intern/wm_files.c
    branches/render25/source/blender/windowmanager/intern/wm_keymap.c
    branches/render25/source/blender/windowmanager/intern/wm_operators.c
    branches/render25/source/creator/SConscript
    branches/render25/source/gameengine/GameLogic/Makefile

Added Paths:
-----------
    branches/render25/projectfiles_vc9/blender/modifiers/
    branches/render25/projectfiles_vc9/blender/modifiers/modifiers.vcproj
    branches/render25/release/scripts/presets/interaction/
    branches/render25/release/scripts/presets/interaction/blender.py
    branches/render25/release/scripts/presets/interaction/maya.py
    branches/render25/release/scripts/ui/space_userpref_keymap.py

Removed Paths:
-------------
    branches/render25/projectfiles_vc9/blender/modifiers/modifiers.vcproj
    branches/render25/release/scripts/presets/interaction/blender.py
    branches/render25/release/scripts/presets/interaction/maya.py

Modified: branches/render25/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/render25/intern/guardedalloc/intern/mallocn.c	2010-04-15 10:28:32 UTC (rev 28202)
+++ branches/render25/intern/guardedalloc/intern/mallocn.c	2010-04-15 10:30:02 UTC (rev 28203)
@@ -463,12 +463,17 @@
 	/* sort by length and print */
 	qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
 	printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use/(double)(1024*1024));
+	printf(" ITEMS TOTAL-MiB AVERAGE-KiB TYPE\n");
 	for(a=0, pb=printblock; a<totpb; a++, pb++)
-		printf("%s items: %d, len: %.3f MB\n", pb->name, pb->items, (double)pb->len/(double)(1024*1024));
+		printf("%6d (%8.3f  %8.3f) %s\n", pb->items, (double)pb->len/(double)(1024*1024), (double)pb->len/1024.0/(double)pb->items, pb->name);
 
 	free(printblock);
 	
 	mem_unlock_thread();
+
+#if 0 /* GLIBC only */
+	malloc_stats();
+#endif
 }
 
 /* Prints in python syntax for easy */

Modified: branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2010-04-15 10:28:32 UTC (rev 28202)
+++ branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj	2010-04-15 10:30:02 UTC (rev 28203)
@@ -392,7 +392,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\blf.c"
+					RelativePath="..\..\..\source\blender\python\generic\blf_api.c"
 					>
 				</File>
 				<File
@@ -400,33 +400,37 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\euler.c"
+					RelativePath="..\..\..\source\blender\python\generic\geometry.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\Geometry.c"
+					RelativePath="..\..\..\source\blender\python\generic\IDProp.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\IDProp.c"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\Mathutils.c"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_color.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\matrix.c"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_euler.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\quat.c"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_matrix.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\vector.c"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_quat.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_vector.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -489,7 +493,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\blf.h"
+					RelativePath="..\..\..\source\blender\python\generic\blf_api.h"
 					>
 				</File>
 				<File
@@ -497,33 +501,37 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\euler.h"
+					RelativePath="..\..\..\source\blender\python\generic\geometry.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\Geometry.h"
+					RelativePath="..\..\..\source\blender\python\generic\IDProp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\IDProp.h"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\Mathutils.h"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_color.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\matrix.h"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_euler.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\quat.h"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_matrix.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\source\blender\python\generic\vector.h"
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_quat.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\source\blender\python\generic\mathutils_vector.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 	</Files>

Modified: branches/render25/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/render25/projectfiles_vc9/blender/blender.sln	2010-04-15 10:28:32 UTC (rev 28202)
+++ branches/render25/projectfiles_vc9/blender/blender.sln	2010-04-15 10:30:02 UTC (rev 28203)
@@ -7,6 +7,7 @@
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B} = {6E24BF09-9653-4166-A871-F65CC9E98A9B}
 		{A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9}
 		{FB88301F-F725-401B-ACD7-D2ABBF333B71} = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC} = {7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}
 		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2} = {76D3102B-7DD2-8BA1-034A-8B19FE2897C2}
 		{BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE} = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
 		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
@@ -337,6 +338,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BF_collada", "collada\BF_collada.vcproj", "{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_modifiers", "modifiers\modifiers.vcproj", "{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		3D Plugin Debug|Win32 = 3D Plugin Debug|Win32
@@ -1594,6 +1597,26 @@
 		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Debug|Win32.Build.0 = Blender Debug|Win32
 		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Release|Win32.ActiveCfg = Blender Release|Win32
 		{76D3102B-7DD2-8BA1-034A-8B19FE2897C2}.Release|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3D Plugin Debug|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3D Plugin Debug|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3D Plugin Release|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3D Plugin Release|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3DPlugin Debug|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3DPlugin Debug|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3DPlugin Release|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.3DPlugin Release|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Blender Release|Win32.Build.0 = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.BlenderPlayer Debug|Win32.ActiveCfg = BlenderPlayer Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.BlenderPlayer Debug|Win32.Build.0 = BlenderPlayer Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.BlenderPlayer Release|Win32.ActiveCfg = BlenderPlayer Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.BlenderPlayer Release|Win32.Build.0 = BlenderPlayer Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Debug|Win32.Build.0 = Blender Debug|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Release|Win32.ActiveCfg = Blender Release|Win32
+		{7CB0C521-91E0-40CE-A7C4-45FEA7ABE8BC}.Release|Win32.Build.0 = Blender Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/render25/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blender.vcproj	2010-04-15 10:28:32 UTC (rev 28202)
+++ branches/render25/projectfiles_vc9/blender/blender.vcproj	2010-04-15 10:30:02 UTC (rev 28203)
@@ -45,8 +45,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\editors\include;..\..\source\blender\python;..\..\source\blender\windowmanager;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\makesrna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging;..\..\..\build\msvc_9\extern\glew\include;..\..\source\blender\gpu"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;GAMEBLENDER=1;USE_SUMO_SOLID;FTGL_LIBRARY_STATIC"
+				AdditionalIncludeDirectories="..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\editors\include;..\..\source\blender\python;..\..\source\blender\windowmanager;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\makesrna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging;..\..\..\build\msvc_9\extern\glew\include;..\..\source\blender\gpu;..\..\..\lib\windows\pthreads\include"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list