[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41547] branches/soc-2011-carrot: Merge with trunk r41545

Miika Hamalainen miika.hamalainen at kolumbus.fi
Sat Nov 5 09:04:53 CET 2011


Revision: 41547
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41547
Author:   miikah
Date:     2011-11-05 08:04:49 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Merge with trunk r41545

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

Modified Paths:
--------------
    branches/soc-2011-carrot/CMakeLists.txt
    branches/soc-2011-carrot/GNUmakefile
    branches/soc-2011-carrot/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check_config.py
    branches/soc-2011-carrot/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2011-carrot/build_files/cmake/macros.cmake
    branches/soc-2011-carrot/build_files/cmake/project_info.py
    branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-carrot/build_files/scons/tools/Blender.py
    branches/soc-2011-carrot/build_files/scons/tools/btools.py
    branches/soc-2011-carrot/doc/doxygen/Doxyfile
    branches/soc-2011-carrot/doc/doxygen/doxygen.source
    branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-carrot/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2011-carrot/intern/audaspace/intern/AUD_C-API.h
    branches/soc-2011-carrot/intern/ghost/CMakeLists.txt
    branches/soc-2011-carrot/intern/ghost/intern/GHOST_Buttons.h
    branches/soc-2011-carrot/intern/ghost/intern/GHOST_DisplayManager.h
    branches/soc-2011-carrot/intern/ghost/intern/GHOST_EventWheel.h
    branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2011-carrot/release/scripts/modules/bpy/__init__.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_context.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_scene.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_screen.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-carrot/source/blender/blenkernel/intern/action.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/key.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/library.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/material.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/screen.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/smoke.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/speaker.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/world.c
    branches/soc-2011-carrot/source/blender/blenlib/BLI_bpath.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2011-carrot/source/blender/blenlib/BLI_threads.h
    branches/soc-2011-carrot/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenlib/intern/bpath.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/threads.c
    branches/soc-2011-carrot/source/blender/blenlib/intern/uvproject.c
    branches/soc-2011-carrot/source/blender/blenloader/BLO_readfile.h
    branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-carrot/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-carrot/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-carrot/source/blender/editors/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/SConscript
    branches/soc-2011-carrot/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-carrot/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-carrot/source/blender/editors/curve/editcurve.c
    branches/soc-2011-carrot/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_node.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_render.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_screen.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_space_api.h
    branches/soc-2011-carrot/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-carrot/source/blender/editors/interface/interface.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-carrot/source/blender/editors/interface/resources.c
    branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-carrot/source/blender/editors/object/object_add.c
    branches/soc-2011-carrot/source/blender/editors/object/object_bake.c
    branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
    branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
    branches/soc-2011-carrot/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-carrot/source/blender/editors/render/render_internal.c
    branches/soc-2011-carrot/source/blender/editors/render/render_preview.c
    branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
    branches/soc-2011-carrot/source/blender/editors/render/render_update.c
    branches/soc-2011-carrot/source/blender/editors/render/render_view.c
    branches/soc-2011-carrot/source/blender/editors/screen/area.c
    branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-carrot/source/blender/editors/space_api/spacetypes.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_image/image_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_header.c
    branches/soc-2011-carrot/source/blender/editors/space_node/space_node.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-carrot/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_script/script_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_time/time_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-carrot/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/moviecache.c
    branches/soc-2011-carrot/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_world_types.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_common.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/soc-2011-carrot/source/blender/python/BPY_extern.h
    branches/soc-2011-carrot/source/blender/python/generic/IDProp.c
    branches/soc-2011-carrot/source/blender/python/generic/IDProp.h
    branches/soc-2011-carrot/source/blender/python/generic/bgl.c
    branches/soc-2011-carrot/source/blender/python/generic/bgl.h
    branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Color.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_geometry.h
    branches/soc-2011-carrot/source/blender/python/simple_enum_gen.py
    branches/soc-2011-carrot/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2011-carrot/source/blender/render/extern/include/RE_engine.h
    branches/soc-2011-carrot/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-carrot/source/blender/render/intern/include/render_types.h
    branches/soc-2011-carrot/source/blender/render/intern/include/texture.h
    branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-carrot/source/blender/render/intern/source/envmap.c
    branches/soc-2011-carrot/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-carrot/source/blender/render/intern/source/initrender.c
    branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-carrot/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-carrot/source/creator/creator.c
    branches/soc-2011-carrot/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-carrot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-carrot/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-carrot/source/gameengine/Expressions/StringValue.h
    branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonSeq.h
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2011-carrot/source/gameengine/VideoTexture/BlendType.h
    branches/soc-2011-carrot/source/gameengine/VideoTexture/FilterBase.cpp
    branches/soc-2011-carrot/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2011-carrot/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2011-carrot/source/gameengine/VideoTexture/Texture.cpp
    branches/soc-2011-carrot/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2011-carrot/doc/python_api/examples/bpy.app.handlers.1.py
    branches/soc-2011-carrot/doc/python_api/examples/bpy.app.handlers.py
    branches/soc-2011-carrot/release/scripts/presets/camera/
    branches/soc-2011-carrot/release/scripts/presets/camera/APS-C_DSLR.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Blender.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1100D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1DS.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_500D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_550D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_5D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_600D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_60D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_7D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D300S.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D3100.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D35.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D5000.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D5100.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D7000.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D90.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_Epic.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_2K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_3K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_4K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/full_frame_35mm_film.py
    branches/soc-2011-carrot/release/scripts/presets/camera/micro_four_thirds.py
    branches/soc-2011-carrot/release/scripts/presets/camera/super_16_film.py
    branches/soc-2011-carrot/release/scripts/presets/camera/super_35_film.py

Removed Paths:
-------------
    branches/soc-2011-carrot/release/scripts/presets/camera/APS-C_DSLR.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Blender.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1100D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_1DS.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_500D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_550D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_5D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_600D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_60D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Canon_7D.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D300S.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D3100.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D35.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D5000.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D5100.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D7000.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Nikon_D90.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_Epic.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_2K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_3K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/Red_One_4K.py
    branches/soc-2011-carrot/release/scripts/presets/camera/full_frame_35mm_film.py
    branches/soc-2011-carrot/release/scripts/presets/camera/micro_four_thirds.py
    branches/soc-2011-carrot/release/scripts/presets/camera/super_16_film.py
    branches/soc-2011-carrot/release/scripts/presets/camera/super_35_film.py
    branches/soc-2011-carrot/source/blender/editors/space_script/script_header.c
    branches/soc-2011-carrot/source/blender/editors/space_sound/

Property Changed:
----------------
    branches/soc-2011-carrot/
    branches/soc-2011-carrot/intern/audaspace/OpenAL/
    branches/soc-2011-carrot/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36828-41411
   + /trunk/blender:36828-41545

Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/CMakeLists.txt	2011-11-05 08:04:49 UTC (rev 41547)
@@ -157,6 +157,8 @@
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
+	mark_as_advanced(WITH_XDG_USER_DIRS)
 else()
 	# not an option for other OS's
 	set(WITH_BUILTIN_GLEW ON)
@@ -1255,6 +1257,8 @@
 
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 

Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/GNUmakefile	2011-11-05 08:04:49 UTC (rev 41547)
@@ -151,6 +151,7 @@
 	@echo ""
 	@echo "Documentation Targets (not assosiated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
+	@echo "  * doc_doxy - generate doxygen C/C++ docs"
 	@echo "  * doc_dna  - generate blender file format reference"
 	@echo "  * doc_man  - generate manpage"
 	@echo ""
@@ -238,9 +239,13 @@
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py:
 	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
-	cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
+doc_doxy:
+	cd doc/doxygen; doxygen 
+	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
+
 doc_dna:
 	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"

Modified: branches/soc-2011-carrot/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-11-05 08:04:49 UTC (rev 41547)
@@ -44,8 +44,19 @@
 MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
 
 
+# if the user passes these defines as args, we dont want to overwrite
+SET(_IS_INC_DEF OFF)
+SET(_IS_LIB_DEF OFF)
+IF(DEFINED PYTHON_INCLUDE_DIR)
+  SET(_IS_INC_DEF ON)
+ENDIF()
+IF(DEFINED PYTHON_LIBRARY)
+  SET(_IS_LIB_DEF ON)
+ENDIF()
+
+
 # only search for the dirs if we havn't already
-IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
 
   SET(_python_ABI_FLAGS
     "m;mu;u; "    # release
@@ -66,30 +77,38 @@
     #ENDIF()
     STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
 
-    FIND_PATH(PYTHON_INCLUDE_DIR
-      NAMES
-        Python.h
-      HINTS
-        ${_python_SEARCH_DIRS}
-      PATH_SUFFIXES
-        include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-    )
+    IF(NOT DEFINED PYTHON_INCLUDE_DIR)
+      FIND_PATH(PYTHON_INCLUDE_DIR
+        NAMES
+          Python.h
+        HINTS
+          ${_python_SEARCH_DIRS}
+        PATH_SUFFIXES
+          include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+      )
+    ENDIF()
 
-    FIND_LIBRARY(PYTHON_LIBRARY
-      NAMES
-        "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
-      HINTS
-        ${_python_SEARCH_DIRS}
-      PATH_SUFFIXES
-        lib64 lib
-    )
+    IF(NOT DEFINED PYTHON_LIBRARY)
+      FIND_LIBRARY(PYTHON_LIBRARY
+        NAMES
+          "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
+        HINTS
+          ${_python_SEARCH_DIRS}
+        PATH_SUFFIXES
+          lib64 lib
+      )
+    ENDIF()
 
     IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
       break()
     ELSE()
       # ensure we dont find values from 2 different ABI versions
-      UNSET(PYTHON_INCLUDE_DIR CACHE)
-      UNSET(PYTHON_LIBRARY CACHE)
+      IF(NOT _IS_INC_DEF)
+        UNSET(PYTHON_INCLUDE_DIR CACHE)
+      ENDIF()
+      IF(NOT _IS_LIB_DEF)
+        UNSET(PYTHON_LIBRARY CACHE)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 
@@ -100,6 +119,9 @@
   UNSET(_python_SEARCH_DIRS)
 ENDIF()
 
+UNSET(_IS_INC_DEF)
+UNSET(_IS_LIB_DEF)
+
 # handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)

Modified: branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check_config.py	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check_config.py	2011-11-05 08:04:49 UTC (rev 41547)
@@ -29,8 +29,8 @@
     "source/blender/imbuf/intern/imbuf_cocoa.m",
     "extern/recastnavigation/Recast/Source/RecastLog.cpp",
     "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
-    "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
-    "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+    "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+    "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
 
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -44,7 +44,7 @@
     "extern/eltopo/common/meshes/ObjLoader.hpp",
     "extern/eltopo/common/meshes/TriangleIndex.hpp",
     "extern/eltopo/common/meshes/meshloader.h",
-    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
     "extern/recastnavigation/Recast/Include/RecastLog.h",
     "extern/recastnavigation/Recast/Include/RecastTimer.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",

Modified: branches/soc-2011-carrot/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/cmake_qtcreator_project.py	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/build_files/cmake/cmake_qtcreator_project.py	2011-11-05 08:04:49 UTC (rev 41547)
@@ -40,6 +40,7 @@
                           is_py,
                           cmake_advanced_info,
                           cmake_compiler_defines,
+                          project_name_get,
                           )
 
 import os
@@ -59,7 +60,8 @@
         f.write("\n".join(files_rel))
 
         f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
-        f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
+        f.write("\n".join(sorted(list(set(os.path.dirname(f)
+                          for f in files_rel if is_c_header(f))))))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
         f = open(qtc_prj, 'w')
@@ -73,10 +75,16 @@
         includes, defines = cmake_advanced_info()
 
         # for some reason it doesnt give all internal includes
-        includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
+        includes = list(set(includes) | set(os.path.dirname(f)
+                        for f in files_rel if is_c_header(f)))
         includes.sort()
 
-        PROJECT_NAME = "Blender"
+        if 0:
+            PROJECT_NAME = "Blender"
+        else:
+            # be tricky, get the project name from SVN if we can!
+            PROJECT_NAME = project_name_get(SOURCE_DIR)
+
         FILE_NAME = PROJECT_NAME.lower()
         f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
         f.write("\n".join(files_rel))
@@ -93,7 +101,7 @@
         f.write("// ADD PREDEFINED MACROS HERE!\n")
         defines_final = [("#define %s %s" % item) for item in defines]
         if sys.platform != "win32":
-            defines_final += cmake_compiler_defines()  # defines from the compiler
+            defines_final += cmake_compiler_defines()
         f.write("\n".join(defines_final))
 
     print("Blender project file written to: %s" % qtc_prj)
@@ -106,7 +114,12 @@
     files_rel.sort()
 
     # --- qtcreator specific, simple format
-    PROJECT_NAME = "Blender_Python"
+    if 0:
+        PROJECT_NAME = "Blender_Python"
+    else:
+        # be tricky, get the project name from SVN if we can!
+        PROJECT_NAME = project_name_get(SOURCE_DIR) + "_Python"
+
     FILE_NAME = PROJECT_NAME.lower()
     f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
     f.write("\n".join(files_rel))

Modified: branches/soc-2011-carrot/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/macros.cmake	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/build_files/cmake/macros.cmake	2011-11-05 08:04:49 UTC (rev 41547)
@@ -413,8 +413,7 @@
 		remove_cc_flag("-Werror")
 
 		# negate flags implied by '-Wall'
-		add_cc_flag("-Wno-unused-parameter")
-		add_cc_flag("-Wno-unused-but-set-variable")
+		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
 	if(MSVC)

Modified: branches/soc-2011-carrot/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/project_info.py	2011-11-05 07:39:59 UTC (rev 41546)
+++ branches/soc-2011-carrot/build_files/cmake/project_info.py	2011-11-05 08:04:49 UTC (rev 41547)
@@ -41,6 +41,7 @@
     "is_py",
     "cmake_advanced_info",

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list