[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40047] branches/hive: Initial commit of patch that gives main loop control to Python

Sjoerd de Vries sjdv1982 at gmail.com
Fri Sep 9 00:13:13 CEST 2011 

Revision: 40047
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40047
Author:   sjoerddevries
Date:     2011-09-08 22:13:11 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Initial commit of patch that gives main loop control to Python 

Modified Paths:
--------------
    branches/hive/CMakeLists.txt
    branches/hive/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/hive/build_files/cmake/macros.cmake
    branches/hive/build_files/scons/config/darwin-config.py
    branches/hive/build_files/scons/config/linuxcross-config.py
    branches/hive/build_files/scons/config/win32-mingw-config.py
    branches/hive/doc/python_api/examples/bge.texture.1.py
    branches/hive/doc/python_api/examples/bpy.types.Operator.py
    branches/hive/doc/python_api/rst/bgl.rst
    branches/hive/doc/python_api/rst/info_quickstart.rst
    branches/hive/doc/python_api/rst/info_tips_and_tricks.rst
    branches/hive/doc/python_api/sphinx_doc_gen.py
    branches/hive/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/hive/intern/guardedalloc/MEM_sys_types.h
    branches/hive/intern/opennl/CMakeLists.txt
    branches/hive/intern/smoke/CMakeLists.txt
    branches/hive/intern/smoke/SConscript
    branches/hive/intern/smoke/intern/FFT_NOISE.h
    branches/hive/intern/smoke/intern/WTURBULENCE.cpp
    branches/hive/intern/tools/credits_svn_gen.py
    branches/hive/intern/tools/pydna.py
    branches/hive/release/datafiles/blenderbuttons
    branches/hive/release/scripts/modules/bpy_types.py
    branches/hive/release/scripts/startup/bl_operators/animsys_update.py
    branches/hive/release/scripts/startup/bl_operators/nla.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/hive/release/scripts/startup/bl_ui/properties_game.py
    branches/hive/release/scripts/startup/bl_ui/space_userpref.py
    branches/hive/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/hive/source/blender/blenkernel/BKE_blender.h
    branches/hive/source/blender/blenkernel/BKE_global.h
    branches/hive/source/blender/blenkernel/BKE_node.h
    branches/hive/source/blender/blenkernel/intern/blender.c
    branches/hive/source/blender/blenkernel/intern/material.c
    branches/hive/source/blender/blenkernel/intern/node.c
    branches/hive/source/blender/blenkernel/intern/texture.c
    branches/hive/source/blender/blenlib/BLI_math_matrix.h
    branches/hive/source/blender/blenlib/BLI_math_vector.h
    branches/hive/source/blender/blenlib/intern/math_matrix.c
    branches/hive/source/blender/blenlib/intern/math_vector.c
    branches/hive/source/blender/blenlib/intern/string.c
    branches/hive/source/blender/blenloader/BLO_sys_types.h
    branches/hive/source/blender/blenloader/CMakeLists.txt
    branches/hive/source/blender/blenloader/SConscript
    branches/hive/source/blender/blenloader/intern/readfile.c
    branches/hive/source/blender/blenloader/intern/writefile.c
    branches/hive/source/blender/collada/ArmatureExporter.cpp
    branches/hive/source/blender/collada/ArmatureExporter.h
    branches/hive/source/blender/collada/CMakeLists.txt
    branches/hive/source/blender/collada/CameraExporter.cpp
    branches/hive/source/blender/collada/CameraExporter.h
    branches/hive/source/blender/collada/DocumentExporter.cpp
    branches/hive/source/blender/collada/DocumentExporter.h
    branches/hive/source/blender/collada/DocumentImporter.cpp
    branches/hive/source/blender/collada/EffectExporter.cpp
    branches/hive/source/blender/collada/EffectExporter.h
    branches/hive/source/blender/collada/GeometryExporter.cpp
    branches/hive/source/blender/collada/GeometryExporter.h
    branches/hive/source/blender/collada/ImageExporter.cpp
    branches/hive/source/blender/collada/ImageExporter.h
    branches/hive/source/blender/collada/LightExporter.cpp
    branches/hive/source/blender/collada/LightExporter.h
    branches/hive/source/blender/collada/MaterialExporter.cpp
    branches/hive/source/blender/collada/MaterialExporter.h
    branches/hive/source/blender/collada/collada.cpp
    branches/hive/source/blender/editors/datafiles/blenderbuttons.c
    branches/hive/source/blender/editors/gpencil/CMakeLists.txt
    branches/hive/source/blender/editors/gpencil/drawgpencil.c
    branches/hive/source/blender/editors/gpencil/gpencil_edit.c
    branches/hive/source/blender/editors/gpencil/gpencil_intern.h
    branches/hive/source/blender/editors/gpencil/gpencil_ops.c
    branches/hive/source/blender/editors/gpencil/gpencil_paint.c
    branches/hive/source/blender/editors/include/ED_gpencil.h
    branches/hive/source/blender/editors/include/ED_node.h
    branches/hive/source/blender/editors/include/UI_icons.h
    branches/hive/source/blender/editors/mesh/editmesh_mods.c
    branches/hive/source/blender/editors/mesh/editmesh_tools.c
    branches/hive/source/blender/editors/sculpt_paint/paint_image.c
    branches/hive/source/blender/editors/sculpt_paint/sculpt.c
    branches/hive/source/blender/editors/space_node/drawnode.c
    branches/hive/source/blender/editors/space_node/node_buttons.c
    branches/hive/source/blender/editors/space_node/node_draw.c
    branches/hive/source/blender/editors/space_node/node_edit.c
    branches/hive/source/blender/editors/space_node/node_header.c
    branches/hive/source/blender/editors/space_node/node_intern.h
    branches/hive/source/blender/editors/space_node/node_ops.c
    branches/hive/source/blender/editors/space_node/node_select.c
    branches/hive/source/blender/editors/space_node/node_state.c
    branches/hive/source/blender/editors/space_node/space_node.c
    branches/hive/source/blender/editors/space_view3d/view3d_edit.c
    branches/hive/source/blender/editors/transform/transform.c
    branches/hive/source/blender/editors/transform/transform_conversions.c
    branches/hive/source/blender/editors/util/undo.c
    branches/hive/source/blender/gpu/SConscript
    branches/hive/source/blender/makesdna/DNA_modifier_types.h
    branches/hive/source/blender/makesdna/DNA_node_types.h
    branches/hive/source/blender/makesdna/DNA_userdef_types.h
    branches/hive/source/blender/makesrna/RNA_access.h
    branches/hive/source/blender/makesrna/RNA_enum_types.h
    branches/hive/source/blender/makesrna/RNA_types.h
    branches/hive/source/blender/makesrna/SConscript
    branches/hive/source/blender/makesrna/intern/CMakeLists.txt
    branches/hive/source/blender/makesrna/intern/SConscript
    branches/hive/source/blender/makesrna/intern/rna_access.c
    branches/hive/source/blender/makesrna/intern/rna_internal.h
    branches/hive/source/blender/makesrna/intern/rna_main_api.c
    branches/hive/source/blender/makesrna/intern/rna_modifier.c
    branches/hive/source/blender/makesrna/intern/rna_nodetree.c
    branches/hive/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/hive/source/blender/makesrna/intern/rna_object.c
    branches/hive/source/blender/makesrna/intern/rna_rna.c
    branches/hive/source/blender/makesrna/intern/rna_screen.c
    branches/hive/source/blender/makesrna/intern/rna_smoke.c
    branches/hive/source/blender/makesrna/intern/rna_space.c
    branches/hive/source/blender/makesrna/intern/rna_texture.c
    branches/hive/source/blender/makesrna/intern/rna_texture_api.c
    branches/hive/source/blender/makesrna/intern/rna_userdef.c
    branches/hive/source/blender/makesrna/intern/rna_wm.c
    branches/hive/source/blender/makesrna/intern/rna_world.c
    branches/hive/source/blender/modifiers/CMakeLists.txt
    branches/hive/source/blender/modifiers/MOD_modifiertypes.h
    branches/hive/source/blender/modifiers/SConscript
    branches/hive/source/blender/modifiers/intern/MOD_util.c
    branches/hive/source/blender/nodes/CMakeLists.txt
    branches/hive/source/blender/nodes/SConscript
    branches/hive/source/blender/nodes/intern/node_util.c
    branches/hive/source/blender/nodes/intern/node_util.h
    branches/hive/source/blender/python/generic/bpy_internal_import.c
    branches/hive/source/blender/python/generic/py_capi_utils.c
    branches/hive/source/blender/python/intern/bpy_rna.c
    branches/hive/source/blender/python/mathutils/mathutils_geometry.c
    branches/hive/source/blender/render/intern/source/render_texture.c
    branches/hive/source/blender/windowmanager/intern/wm_event_system.c
    branches/hive/source/blender/windowmanager/intern/wm_keymap.c
    branches/hive/source/blender/windowmanager/intern/wm_operators.c
    branches/hive/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/hive/source/creator/CMakeLists.txt
    branches/hive/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/hive/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/hive/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/hive/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/hive/source/gameengine/Expressions/ListValue.cpp
    branches/hive/source/gameengine/Expressions/Value.cpp
    branches/hive/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/hive/source/gameengine/Ketsji/KX_Scene.cpp
    branches/hive/source/gameengine/Ketsji/KX_SoundActuator.cpp

Added Paths:
-----------
    branches/hive/build_files/cmake/Modules/FindPCRE.cmake
    branches/hive/build_files/cmake/Modules/FindXML2.cmake
    branches/hive/source/blender/collada/ErrorHandler.cpp
    branches/hive/source/blender/collada/ErrorHandler.h
    branches/hive/source/blender/collada/ExportSettings.cpp
    branches/hive/source/blender/collada/ExportSettings.h
    branches/hive/source/blender/collada/SceneExporter.cpp
    branches/hive/source/blender/collada/SceneExporter.h
    branches/hive/source/blender/editors/gpencil/gpencil_undo.c
    branches/hive/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/hive/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/hive/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/hive/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/hive/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/hive/source/blender/nodes/NOD_composite.h
    branches/hive/source/blender/nodes/NOD_shader.h
    branches/hive/source/blender/nodes/NOD_socket.h
    branches/hive/source/blender/nodes/NOD_texture.h
    branches/hive/source/blender/nodes/composite/
    branches/hive/source/blender/nodes/composite/node_composite_tree.c
    branches/hive/source/blender/nodes/composite/node_composite_util.c
    branches/hive/source/blender/nodes/composite/node_composite_util.h
    branches/hive/source/blender/nodes/composite/nodes/
    branches/hive/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/hive/source/blender/nodes/intern/node_common.c
    branches/hive/source/blender/nodes/intern/node_common.h
    branches/hive/source/blender/nodes/intern/node_exec.c
    branches/hive/source/blender/nodes/intern/node_exec.h
    branches/hive/source/blender/nodes/intern/node_socket.c
    branches/hive/source/blender/nodes/shader/
    branches/hive/source/blender/nodes/shader/node_shader_tree.c
    branches/hive/source/blender/nodes/shader/node_shader_util.c
    branches/hive/source/blender/nodes/shader/node_shader_util.h
    branches/hive/source/blender/nodes/shader/nodes/
    branches/hive/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/hive/source/blender/nodes/texture/
    branches/hive/source/blender/nodes/texture/node_texture_tree.c
    branches/hive/source/blender/nodes/texture/node_texture_util.c
    branches/hive/source/blender/nodes/texture/node_texture_util.h
    branches/hive/source/blender/nodes/texture/nodes/
    branches/hive/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_viewer.c

Removed Paths:
-------------
    branches/hive/source/blender/nodes/CMP_node.h
    branches/hive/source/blender/nodes/SHD_node.h
    branches/hive/source/blender/nodes/TEX_node.h
    branches/hive/source/blender/nodes/composite/node_composite_tree.c
    branches/hive/source/blender/nodes/composite/node_composite_util.c
    branches/hive/source/blender/nodes/composite/node_composite_util.h
    branches/hive/source/blender/nodes/composite/nodes/
    branches/hive/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/hive/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/hive/source/blender/nodes/intern/CMP_nodes/
    branches/hive/source/blender/nodes/intern/CMP_util.c
    branches/hive/source/blender/nodes/intern/CMP_util.h
    branches/hive/source/blender/nodes/intern/SHD_nodes/
    branches/hive/source/blender/nodes/intern/SHD_util.c
    branches/hive/source/blender/nodes/intern/SHD_util.h
    branches/hive/source/blender/nodes/intern/TEX_nodes/
    branches/hive/source/blender/nodes/intern/TEX_util.c
    branches/hive/source/blender/nodes/intern/TEX_util.h
    branches/hive/source/blender/nodes/shader/node_shader_tree.c
    branches/hive/source/blender/nodes/shader/node_shader_util.c
    branches/hive/source/blender/nodes/shader/node_shader_util.h
    branches/hive/source/blender/nodes/shader/nodes/
    branches/hive/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/hive/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/hive/source/blender/nodes/texture/node_texture_tree.c
    branches/hive/source/blender/nodes/texture/node_texture_util.c
    branches/hive/source/blender/nodes/texture/node_texture_util.h
    branches/hive/source/blender/nodes/texture/nodes/
    branches/hive/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/hive/source/blender/nodes/texture/nodes/node_texture_viewer.c

Property Changed:
----------------
    branches/hive/
    branches/hive/release/scripts/modules/bpy/ops.py
    branches/hive/release/scripts/modules/bpy/utils.py
    branches/hive/release/scripts/presets/sss/chicken.py
    branches/hive/release/scripts/presets/sss/cream.py
    branches/hive/release/scripts/presets/sss/ketchup.py
    branches/hive/release/scripts/presets/sss/marble.py
    branches/hive/release/scripts/presets/sss/potato.py
    branches/hive/release/scripts/presets/sss/skim_milk.py
    branches/hive/release/scripts/presets/sss/skin1.py
    branches/hive/release/scripts/presets/sss/skin2.py
    branches/hive/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/hive/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/hive/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/hive/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/hive/release/scripts/startup/bl_ui/properties_game.py
    branches/hive/release/scripts/startup/bl_ui/properties_material.py
    branches/hive/release/scripts/startup/bl_ui/properties_particle.py
    branches/hive/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/hive/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/hive/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/hive/release/scripts/startup/bl_ui/properties_texture.py
    branches/hive/release/scripts/startup/bl_ui/properties_world.py
    branches/hive/release/scripts/startup/bl_ui/space_node.py
    branches/hive/source/blender/blenkernel/BKE_customdata_file.h
    branches/hive/source/blender/blenkernel/intern/customdata_file.c
    branches/hive/source/blender/editors/datafiles/startup.blend.c
    branches/hive/source/blender/editors/include/ED_particle.h
    branches/hive/source/blender/editors/include/ED_physics.h
    branches/hive/source/blender/editors/include/ED_render.h
    branches/hive/source/blender/editors/include/ED_transform.h
    branches/hive/source/blender/editors/interface/interface_intern.h
    branches/hive/source/blender/editors/mesh/mesh_data.c
    branches/hive/source/blender/editors/metaball/mball_edit.c
    branches/hive/source/blender/editors/object/object_add.c
    branches/hive/source/blender/editors/object/object_constraint.c
    branches/hive/source/blender/editors/object/object_group.c
    branches/hive/source/blender/editors/object/object_hook.c
    branches/hive/source/blender/editors/object/object_lattice.c
    branches/hive/source/blender/editors/object/object_relations.c
    branches/hive/source/blender/editors/object/object_select.c
    branches/hive/source/blender/editors/object/object_shapekey.c
    branches/hive/source/blender/editors/object/object_transform.c
    branches/hive/source/blender/editors/object/object_vgroup.c
    branches/hive/source/blender/editors/physics/particle_boids.c
    branches/hive/source/blender/editors/physics/particle_edit.c
    branches/hive/source/blender/editors/physics/physics_fluid.c
    branches/hive/source/blender/editors/physics/physics_pointcache.c
    branches/hive/source/blender/editors/render/
    branches/hive/source/blender/editors/render/render_intern.h
    branches/hive/source/blender/editors/render/render_preview.c
    branches/hive/source/blender/editors/render/render_shading.c
    branches/hive/source/blender/editors/render/render_update.c
    branches/hive/source/blender/editors/sculpt_paint/
    branches/hive/source/blender/editors/sculpt_paint/paint_image.c
    branches/hive/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/hive/source/blender/editors/sculpt_paint/sculpt.c
    branches/hive/source/blender/editors/space_image/image_buttons.c
    branches/hive/source/blender/editors/space_info/info_ops.c
    branches/hive/source/blender/editors/space_node/node_edit.c
    branches/hive/source/blender/editors/space_node/node_state.c
    branches/hive/source/blender/editors/space_outliner/
    branches/hive/source/blender/editors/space_text/text_ops.c
    branches/hive/source/blender/editors/space_userpref/
    branches/hive/source/blender/editors/space_userpref/space_userpref.c
    branches/hive/source/blender/editors/space_userpref/userpref_intern.h
    branches/hive/source/blender/editors/space_userpref/userpref_ops.c
    branches/hive/source/blender/editors/uvedit/uvedit_buttons.c
    branches/hive/source/blender/editors/uvedit/uvedit_intern.h
    branches/hive/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/hive/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/hive/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/hive/source/blender/gpu/GPU_buffers.h
    branches/hive/source/blender/makesdna/DNA_outliner_types.h
    branches/hive/source/blender/makesrna/intern/rna_sculpt_paint.c


Property changes on: branches/hive
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/blender:39938-40046

Modified: branches/hive/CMakeLists.txt
===================================================================
--- branches/hive/CMakeLists.txt	2011-09-08 19:05:52 UTC (rev 40046)
+++ branches/hive/CMakeLists.txt	2011-09-08 22:13:11 UTC (rev 40047)
@@ -452,15 +452,8 @@
 	if(WITH_OPENCOLLADA)
 		find_package(OpenCOLLADA)
 		if(OPENCOLLADA_FOUND)
-			set(PCRE /usr CACHE PATH "PCRE Directory")
-			mark_as_advanced(PCRE)
-			set(PCRE_LIBPATH ${PCRE}/lib)
-			set(PCRE_LIB pcre)
-
-			set(EXPAT /usr CACHE PATH "Expat Directory")
-			mark_as_advanced(EXPAT)
-			set(EXPAT_LIBPATH ${EXPAT}/lib)
-			set(EXPAT_LIB expat)
+			find_package(XML2)
+			find_package(PCRE)
 		else()
 			set(WITH_OPENCOLLADA OFF)
 		endif()
@@ -797,7 +790,7 @@
 	else()
 		# keep GCC spesific stuff here
 		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
 			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
 			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -1267,6 +1260,7 @@
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1274,6 +1268,7 @@
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 

Modified: branches/hive/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/hive/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-08 19:05:52 UTC (rev 40046)
+++ branches/hive/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-08 22:13:11 UTC (rev 40047)
@@ -49,12 +49,14 @@
   OpenCOLLADAFramework
   OpenCOLLADABaseUtils
   GeneratedSaxParser
+  MathMLSolver
+)
+
+# Fedora openCOLLADA package links these statically
+SET(_opencollada_FIND_STATIC_COMPONENTS
   UTF
-  MathMLSolver
-  pcre
   ftoa
   buffer
-  xml2
 )
 
 SET(_opencollada_SEARCH_DIRS
@@ -104,7 +106,26 @@
   LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()
 
+FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
 
+  FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
+    NAMES
+      ${COMPONENT}
+    HINTS
+      ${_opencollada_SEARCH_DIRS}
+    PATH_SUFFIXES
+      lib64 lib
+      # Ubuntu ppa needs this.
+      lib64/opencollada lib/opencollada
+    )
+  IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+    MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+    LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
+  ENDIF()
+ENDFOREACH()
+
+
 # handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)

Copied: branches/hive/build_files/cmake/Modules/FindPCRE.cmake (from rev 40046, trunk/blender/build_files/cmake/Modules/FindPCRE.cmake)
===================================================================
--- branches/hive/build_files/cmake/Modules/FindPCRE.cmake	                        (rev 0)
+++ branches/hive/build_files/cmake/Modules/FindPCRE.cmake	2011-09-08 22:13:11 UTC (rev 40047)
@@ -0,0 +1,43 @@
+# - Try to find the PCRE regular expression library
+# Once done this will define
+#
+#  PCRE_FOUND - system has the PCRE library
+#  PCRE_INCLUDE_DIR - the PCRE include directory
+#  PCRE_LIBRARIES - The libraries needed to use PCRE
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+  # Already in cache, be silent
+  set(PCRE_FIND_QUIETLY TRUE)
+endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+	
+if (NOT WIN32)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  find_package(PkgConfig)
+  pkg_check_modules(PC_PCRE QUIET libpcre)
+  set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
+endif (NOT WIN32)
+
+find_path(PCRE_INCLUDE_DIR pcre.h
+          HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
+          PATH_SUFFIXES pcre)
+
+find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+
+IF(NOT WIN32)
+        find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+        mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
+        set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
+ELSE()
+        find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY  )
+        set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} )
+        mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCRE_LIBRARY)
+ENDIF()

Copied: branches/hive/build_files/cmake/Modules/FindXML2.cmake (from rev 40046, trunk/blender/build_files/cmake/Modules/FindXML2.cmake)
===================================================================
--- branches/hive/build_files/cmake/Modules/FindXML2.cmake	                        (rev 0)
+++ branches/hive/build_files/cmake/Modules/FindXML2.cmake	2011-09-08 22:13:11 UTC (rev 40047)
@@ -0,0 +1,88 @@
+# - Try to find XML2
+# Once done this will define
+#
+#  XML2_FOUND - system has XML2
+#  XML2_INCLUDE_DIRS - the XML2 include directory
+#  XML2_LIBRARIES - Link these to use XML2
+#  XML2_DEFINITIONS - Compiler switches required for using XML2
+#
+#  Copyright (c) 2008 Andreas Schneider <mail at cynapses.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#
+
+
+if (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
+  # in cache already
+  set(XML2_FOUND TRUE)
+else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(libxml-2.0 _XML2_INCLUDEDIR _XML2_LIBDIR _XML2_LDFLAGS _XML2_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_XML2 libxml-2.0)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(XML2_INCLUDE_DIR
+    NAMES
+      libxml/xpath.h
+    PATHS
+      ${_XML2_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+    PATH_SUFFIXES
+      libxml2
+  )
+
+  find_library(XML2_LIBRARY
+    NAMES
+      xml2
+    PATHS
+      ${_XML2_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  if (XML2_LIBRARY)
+    set(XML2_FOUND TRUE)
+  endif (XML2_LIBRARY)
+
+  set(XML2_INCLUDE_DIRS
+    ${XML2_INCLUDE_DIR}
+  )
+
+  if (XML2_FOUND)
+    set(XML2_LIBRARIES
+      ${XML2_LIBRARIES}
+      ${XML2_LIBRARY}
+    )
+  endif (XML2_FOUND)
+
+  if (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
+     set(XML2_FOUND TRUE)
+  endif (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
+
+  if (XML2_FOUND)
+    if (NOT XML2_FIND_QUIETLY)
+      message(STATUS "Found XML2: ${XML2_LIBRARIES}")
+    endif (NOT XML2_FIND_QUIETLY)
+  else (XML2_FOUND)
+    if (XML2_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find XML2")
+    endif (XML2_FIND_REQUIRED)
+  endif (XML2_FOUND)
+
+  # show the XML2_INCLUDE_DIRS and XML2_LIBRARIES variables only in the advanced view
+  mark_as_advanced(XML2_INCLUDE_DIRS XML2_LIBRARIES)
+
+endif (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
+

Modified: branches/hive/build_files/cmake/macros.cmake
===================================================================
--- branches/hive/build_files/cmake/macros.cmake	2011-09-08 19:05:52 UTC (rev 40046)
+++ branches/hive/build_files/cmake/macros.cmake	2011-09-08 22:13:11 UTC (rev 40047)
@@ -392,6 +392,7 @@
 		remove_flag("-Wstrict-prototypes")
 		remove_flag("-Wunused-parameter")
 		remove_flag("-Wwrite-strings")
+		remove_flag("-Wundef")
 		remove_flag("-Wshadow")
 		remove_flag("-Werror=[^ ]+")
 		remove_flag("-Werror")

Modified: branches/hive/build_files/scons/config/darwin-config.py
===================================================================
--- branches/hive/build_files/scons/config/darwin-config.py	2011-09-08 19:05:52 UTC (rev 40046)
+++ branches/hive/build_files/scons/config/darwin-config.py	2011-09-08 22:13:11 UTC (rev 40047)
@@ -14,7 +14,7 @@
 ###################     Cocoa & architecture settings      ##################
 #############################################################################
 WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
 
 
 cmd = 'uname -p'

Modified: branches/hive/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/hive/build_files/scons/config/linuxcross-config.py	2011-09-08 19:05:52 UTC (rev 40046)
+++ branches/hive/build_files/scons/config/linuxcross-config.py	2011-09-08 22:13:11 UTC (rev 40047)
@@ -127,6 +127,7 @@
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list