[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36412] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 36408.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun May 1 15:50:39 CEST 2011 

Revision: 36412
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36412
Author:   kjym3
Date:     2011-05-01 13:50:38 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36408.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
    branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.1.py
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h
    branches/soc-2008-mxcurioni/release/release_todo.txt
    branches/soc-2008-mxcurioni/release/scripts/presets/interaction/blender.py
    branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_export.py
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/world.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.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/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    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/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_traceback.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/release/datafiles/.Bfs

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-36301
   + /trunk/blender:34011-36408

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-05-01 10:14:09 UTC (rev 36411)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-05-01 13:50:38 UTC (rev 36412)
@@ -102,8 +102,12 @@
 
 # Blender internal features
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
+mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2011-05-01 10:14:09 UTC (rev 36411)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py	2011-05-01 13:50:38 UTC (rev 36412)
@@ -22,20 +22,14 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-# Used for linking against system ffmpeg, but it gives pixelization,, so fall back to ffmpeg from 2.52 temporary
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libdc1394.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libraw1394.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libfaad.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libspeex.a ${BF_FFMPEG_LIBPATH}/libbz2.a ${BF_FFMPEG_LIBPATH}/liboil-0.3.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libgsm.a'
-
 BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libextern_libavformat.a ${BF_FFMPEG_LIBPATH}/libextern_libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavcodec.a ${BF_FFMPEG_LIBPATH}/libextern_libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavutil.a ${BF_FFMPEG_LIBPATH}/libextern_xvidcore.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libmp3lame.a ${BF_FFMPEG_LIBPATH}/libextern_x264.a'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2011-05-01 10:14:09 UTC (rev 36411)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py	2011-05-01 13:50:38 UTC (rev 36412)
@@ -22,20 +22,14 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-# Used for linking against system ffmpeg, but it gives pixelization,, so fall back to ffmpeg from 2.52 temporary
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libdc1394.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libraw1394.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libfaad.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libspeex.a ${BF_FFMPEG_LIBPATH}/libbz2.a ${BF_FFMPEG_LIBPATH}/liboil-0.3.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libgsm.a'
-
 BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libextern_libavformat.a ${BF_FFMPEG_LIBPATH}/libextern_libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavcodec.a ${BF_FFMPEG_LIBPATH}/libextern_libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavutil.a ${BF_FFMPEG_LIBPATH}/libextern_xvidcore.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libmp3lame.a ${BF_FFMPEG_LIBPATH}/libextern_x264.a'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.1.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.1.py	2011-05-01 10:14:09 UTC (rev 36411)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.1.py	2011-05-01 13:50:38 UTC (rev 36412)
@@ -32,7 +32,7 @@
 
     def execute(self, context):
         # rather then printing, use the report function,
-        # this way the messag appiers in the header,
+        # this way the message appears in the header,
         self.report({'INFO'}, "Mouse coords are %d %d" % (self.x, self.y))
         return {'FINISHED'}
 

Modified: branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c	2011-05-01 10:14:09 UTC (rev 36411)
+++ branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c	2011-05-01 13:50:38 UTC (rev 36412)
@@ -83,71 +83,71 @@
 static void gearGL(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, GLint teeth, GLfloat tooth_depth)
 {
 	GLint i;
-    GLfloat r0, r1, r2;
-    GLfloat angle, da;
-    GLfloat u, v, len;
+	GLfloat r0, r1, r2;
+	GLfloat angle, da;
+	GLfloat u, v, len;
 	const double pi = 3.14159264;
 	
-    r0 = inner_radius;
-    r1 = (float)(outer_radius - tooth_depth/2.0);
-    r2 = (float)(outer_radius + tooth_depth/2.0);
+	r0 = inner_radius;
+	r1 = (float)(outer_radius - tooth_depth/2.0);
+	r2 = (float)(outer_radius + tooth_depth/2.0);
 	
-    da = (float)(2.0*pi / teeth / 4.0);
+	da = (float)(2.0*pi / teeth / 4.0);
 	
-    glShadeModel(GL_FLAT);
-    glNormal3f(0.0, 0.0, 1.0);
+	glShadeModel(GL_FLAT);
+	glNormal3f(0.0, 0.0, 1.0);
 	
-    /* draw front face */
-    glBegin(GL_QUAD_STRIP);
-    for (i=0;i<=teeth;i++) {
+	/* draw front face */
+	glBegin(GL_QUAD_STRIP);
+	for (i=0;i<=teeth;i++) {
 		angle = (float)(i * 2.0*pi / teeth);
 		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(width*0.5));
 		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(width*0.5));
 		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(width*0.5));
 		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(width*0.5));
-    }
-    glEnd();
+	}
+	glEnd();
 	
-    /* draw front sides of teeth */
-    glBegin(GL_QUADS);
-    da = (float)(2.0*pi / teeth / 4.0);
-    for (i=0;i<teeth;i++) {
+	/* draw front sides of teeth */
+	glBegin(GL_QUADS);
+	da = (float)(2.0*pi / teeth / 4.0);
+	for (i=0;i<teeth;i++) {
 		angle = (float)(i * 2.0*pi / teeth);
 		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(width*0.5));
 		glVertex3f((float)(r2*cos(angle+da)), (float)(r2*sin(angle+da)), (float)(width*0.5));
 		glVertex3f((float)(r2*cos(angle+2*da)), (float)(r2*sin(angle+2*da)), (float)(width*0.5));
 		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(width*0.5));
-    }
-    glEnd();
+	}
+	glEnd();
 	
-    glNormal3f(0.0, 0.0, -1.0);
+	glNormal3f(0.0, 0.0, -1.0);
 	
 	/* draw back face */
-    glBegin(GL_QUAD_STRIP);
-    for (i=0;i<=teeth;i++) {
+	glBegin(GL_QUAD_STRIP);
+	for (i=0;i<=teeth;i++) {
 		angle = (float)(i * 2.0*pi / teeth);
 		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(-width*0.5));
 		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(-width*0.5));
 		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(-width*0.5));
 		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(-width*0.5));
-    }
-    glEnd();
+	}
+	glEnd();
 	
-    /* draw back sides of teeth */
-    glBegin(GL_QUADS);
-    da = (float)(2.0*pi / teeth / 4.0);
-    for (i=0;i<teeth;i++) {
+	/* draw back sides of teeth */
+	glBegin(GL_QUADS);
+	da = (float)(2.0*pi / teeth / 4.0);

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list