[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40298] branches/cycles: Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Brecht Van Lommel brechtvanlommel at pandora.be
Sat Sep 17 15:28:41 CEST 2011


Revision: 40298
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40298
Author:   blendix
Date:     2011-09-17 13:28:40 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.

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

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt
    branches/cycles/GNUmakefile
    branches/cycles/SConstruct
    branches/cycles/build_files/buildbot/config/user-config-i686.py
    branches/cycles/build_files/buildbot/config/user-config-x86_64.py
    branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/cycles/build_files/cmake/macros.cmake
    branches/cycles/build_files/scons/config/darwin-config.py
    branches/cycles/build_files/scons/config/linuxcross-config.py
    branches/cycles/build_files/scons/config/win32-mingw-config.py
    branches/cycles/build_files/scons/config/win64-vc-config.py
    branches/cycles/doc/python_api/examples/bge.texture.1.py
    branches/cycles/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/cycles/doc/python_api/examples/bpy.types.Operator.py
    branches/cycles/doc/python_api/rst/bgl.rst
    branches/cycles/doc/python_api/rst/info_gotcha.rst
    branches/cycles/doc/python_api/rst/info_quickstart.rst
    branches/cycles/doc/python_api/rst/info_tips_and_tricks.rst
    branches/cycles/doc/python_api/sphinx_doc_gen.py
    branches/cycles/doc/python_api/sphinx_doc_gen.sh
    branches/cycles/extern/CMakeLists.txt
    branches/cycles/extern/SConscript
    branches/cycles/extern/eltopo/common/bfstream.h
    branches/cycles/intern/audaspace/intern/AUD_JOSResampleReader.cpp
    branches/cycles/intern/audaspace/intern/AUD_SequencerHandle.cpp
    branches/cycles/intern/audaspace/intern/AUD_SequencerHandle.h
    branches/cycles/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/cycles/intern/cycles/blender/addon/ui.py
    branches/cycles/intern/cycles/blender/blender_shader.cpp
    branches/cycles/intern/elbeem/CMakeLists.txt
    branches/cycles/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/cycles/intern/guardedalloc/MEM_sys_types.h
    branches/cycles/intern/iksolver/intern/IK_QSegment.cpp
    branches/cycles/intern/opennl/CMakeLists.txt
    branches/cycles/intern/opennl/superlu/superlu_sys_types.h
    branches/cycles/intern/smoke/CMakeLists.txt
    branches/cycles/intern/smoke/SConscript
    branches/cycles/intern/smoke/intern/FFT_NOISE.h
    branches/cycles/intern/smoke/intern/WTURBULENCE.cpp
    branches/cycles/intern/tools/credits_svn_gen.py
    branches/cycles/intern/tools/pydna.py
    branches/cycles/release/datafiles/blenderbuttons
    branches/cycles/release/scripts/modules/bpy_types.py
    branches/cycles/release/scripts/modules/rna_info.py
    branches/cycles/release/scripts/startup/bl_operators/animsys_update.py
    branches/cycles/release/scripts/startup/bl_operators/nla.py
    branches/cycles/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/cycles/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/cycles/release/scripts/startup/bl_ui/properties_data_speaker.py
    branches/cycles/release/scripts/startup/bl_ui/properties_game.py
    branches/cycles/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
    branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/cycles/source/blender/blenfont/intern/blf_font.c
    branches/cycles/source/blender/blenfont/intern/blf_glyph.c
    branches/cycles/source/blender/blenfont/intern/blf_internal.h
    branches/cycles/source/blender/blenfont/intern/blf_internal_types.h
    branches/cycles/source/blender/blenfont/intern/blf_util.c
    branches/cycles/source/blender/blenkernel/BKE_blender.h
    branches/cycles/source/blender/blenkernel/BKE_colortools.h
    branches/cycles/source/blender/blenkernel/BKE_curve.h
    branches/cycles/source/blender/blenkernel/BKE_global.h
    branches/cycles/source/blender/blenkernel/BKE_material.h
    branches/cycles/source/blender/blenkernel/BKE_node.h
    branches/cycles/source/blender/blenkernel/BKE_object.h
    branches/cycles/source/blender/blenkernel/BKE_paint.h
    branches/cycles/source/blender/blenkernel/BKE_sequencer.h
    branches/cycles/source/blender/blenkernel/BKE_sound.h
    branches/cycles/source/blender/blenkernel/CMakeLists.txt
    branches/cycles/source/blender/blenkernel/SConscript
    branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
    branches/cycles/source/blender/blenkernel/intern/action.c
    branches/cycles/source/blender/blenkernel/intern/anim.c
    branches/cycles/source/blender/blenkernel/intern/armature.c
    branches/cycles/source/blender/blenkernel/intern/blender.c
    branches/cycles/source/blender/blenkernel/intern/boids.c
    branches/cycles/source/blender/blenkernel/intern/brush.c
    branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/cycles/source/blender/blenkernel/intern/collision.c
    branches/cycles/source/blender/blenkernel/intern/colortools.c
    branches/cycles/source/blender/blenkernel/intern/curve.c
    branches/cycles/source/blender/blenkernel/intern/customdata.c
    branches/cycles/source/blender/blenkernel/intern/displist.c
    branches/cycles/source/blender/blenkernel/intern/effect.c
    branches/cycles/source/blender/blenkernel/intern/image.c
    branches/cycles/source/blender/blenkernel/intern/ipo.c
    branches/cycles/source/blender/blenkernel/intern/material.c
    branches/cycles/source/blender/blenkernel/intern/mesh_validate.c
    branches/cycles/source/blender/blenkernel/intern/node.c
    branches/cycles/source/blender/blenkernel/intern/object.c
    branches/cycles/source/blender/blenkernel/intern/particle.c
    branches/cycles/source/blender/blenkernel/intern/sca.c
    branches/cycles/source/blender/blenkernel/intern/scene.c
    branches/cycles/source/blender/blenkernel/intern/sequencer.c
    branches/cycles/source/blender/blenkernel/intern/shrinkwrap.c
    branches/cycles/source/blender/blenkernel/intern/sketch.c
    branches/cycles/source/blender/blenkernel/intern/sound.c
    branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/cycles/source/blender/blenkernel/intern/texture.c
    branches/cycles/source/blender/blenkernel/intern/unit.c
    branches/cycles/source/blender/blenlib/BLI_math_inline.h
    branches/cycles/source/blender/blenlib/BLI_math_matrix.h
    branches/cycles/source/blender/blenlib/BLI_math_vector.h
    branches/cycles/source/blender/blenlib/BLI_string.h
    branches/cycles/source/blender/blenlib/BLI_utildefines.h
    branches/cycles/source/blender/blenlib/CMakeLists.txt
    branches/cycles/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/cycles/source/blender/blenlib/intern/graph.c
    branches/cycles/source/blender/blenlib/intern/math_matrix.c
    branches/cycles/source/blender/blenlib/intern/math_vector.c
    branches/cycles/source/blender/blenlib/intern/math_vector_inline.c
    branches/cycles/source/blender/blenlib/intern/noise.c
    branches/cycles/source/blender/blenlib/intern/string.c
    branches/cycles/source/blender/blenloader/BLO_sys_types.h
    branches/cycles/source/blender/blenloader/CMakeLists.txt
    branches/cycles/source/blender/blenloader/SConscript
    branches/cycles/source/blender/blenloader/intern/readfile.c
    branches/cycles/source/blender/blenloader/intern/writefile.c
    branches/cycles/source/blender/collada/AnimationExporter.cpp
    branches/cycles/source/blender/collada/AnimationImporter.cpp
    branches/cycles/source/blender/collada/AnimationImporter.h
    branches/cycles/source/blender/collada/ArmatureExporter.cpp
    branches/cycles/source/blender/collada/ArmatureExporter.h
    branches/cycles/source/blender/collada/ArmatureImporter.cpp
    branches/cycles/source/blender/collada/ArmatureImporter.h
    branches/cycles/source/blender/collada/CMakeLists.txt
    branches/cycles/source/blender/collada/CameraExporter.cpp
    branches/cycles/source/blender/collada/CameraExporter.h
    branches/cycles/source/blender/collada/DocumentExporter.cpp
    branches/cycles/source/blender/collada/DocumentExporter.h
    branches/cycles/source/blender/collada/DocumentImporter.cpp
    branches/cycles/source/blender/collada/EffectExporter.cpp
    branches/cycles/source/blender/collada/EffectExporter.h
    branches/cycles/source/blender/collada/ExtraTags.cpp
    branches/cycles/source/blender/collada/GeometryExporter.cpp
    branches/cycles/source/blender/collada/GeometryExporter.h
    branches/cycles/source/blender/collada/ImageExporter.cpp
    branches/cycles/source/blender/collada/ImageExporter.h
    branches/cycles/source/blender/collada/LightExporter.cpp
    branches/cycles/source/blender/collada/LightExporter.h
    branches/cycles/source/blender/collada/MaterialExporter.cpp
    branches/cycles/source/blender/collada/MaterialExporter.h
    branches/cycles/source/blender/collada/MeshImporter.cpp
    branches/cycles/source/blender/collada/SkinInfo.cpp
    branches/cycles/source/blender/collada/TransformReader.cpp
    branches/cycles/source/blender/collada/TransformWriter.cpp
    branches/cycles/source/blender/collada/collada.cpp
    branches/cycles/source/blender/editors/animation/anim_channels_defines.c
    branches/cycles/source/blender/editors/animation/anim_filter.c
    branches/cycles/source/blender/editors/animation/anim_ops.c
    branches/cycles/source/blender/editors/animation/keyframes_edit.c
    branches/cycles/source/blender/editors/animation/keyframing.c
    branches/cycles/source/blender/editors/armature/editarmature.c
    branches/cycles/source/blender/editors/armature/editarmature_sketch.c
    branches/cycles/source/blender/editors/armature/meshlaplacian.c
    branches/cycles/source/blender/editors/armature/poseSlide.c
    branches/cycles/source/blender/editors/armature/poselib.c
    branches/cycles/source/blender/editors/armature/poseobject.c
    branches/cycles/source/blender/editors/curve/curve_ops.c
    branches/cycles/source/blender/editors/curve/editcurve.c
    branches/cycles/source/blender/editors/datafiles/blenderbuttons.c
    branches/cycles/source/blender/editors/gpencil/CMakeLists.txt
    branches/cycles/source/blender/editors/gpencil/drawgpencil.c
    branches/cycles/source/blender/editors/gpencil/gpencil_edit.c
    branches/cycles/source/blender/editors/gpencil/gpencil_intern.h
    branches/cycles/source/blender/editors/gpencil/gpencil_ops.c
    branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
    branches/cycles/source/blender/editors/include/ED_armature.h
    branches/cycles/source/blender/editors/include/ED_curve.h
    branches/cycles/source/blender/editors/include/ED_gpencil.h
    branches/cycles/source/blender/editors/include/ED_node.h
    branches/cycles/source/blender/editors/include/ED_object.h
    branches/cycles/source/blender/editors/include/ED_sculpt.h
    branches/cycles/source/blender/editors/include/ED_sequencer.h
    branches/cycles/source/blender/editors/include/UI_icons.h
    branches/cycles/source/blender/editors/include/UI_interface.h
    branches/cycles/source/blender/editors/include/UI_resources.h
    branches/cycles/source/blender/editors/interface/interface_draw.c
    branches/cycles/source/blender/editors/interface/interface_layout.c
    branches/cycles/source/blender/editors/interface/interface_node.c
    branches/cycles/source/blender/editors/interface/interface_panel.c
    branches/cycles/source/blender/editors/interface/interface_regions.c
    branches/cycles/source/blender/editors/interface/interface_templates.c
    branches/cycles/source/blender/editors/interface/interface_widgets.c
    branches/cycles/source/blender/editors/interface/resources.c
    branches/cycles/source/blender/editors/mesh/editmesh.c
    branches/cycles/source/blender/editors/mesh/editmesh_add.c
    branches/cycles/source/blender/editors/mesh/editmesh_lib.c
    branches/cycles/source/blender/editors/mesh/editmesh_mods.c
    branches/cycles/source/blender/editors/mesh/editmesh_tools.c
    branches/cycles/source/blender/editors/object/CMakeLists.txt
    branches/cycles/source/blender/editors/object/SConscript
    branches/cycles/source/blender/editors/object/object_add.c
    branches/cycles/source/blender/editors/object/object_constraint.c
    branches/cycles/source/blender/editors/object/object_edit.c
    branches/cycles/source/blender/editors/object/object_hook.c
    branches/cycles/source/blender/editors/object/object_intern.h
    branches/cycles/source/blender/editors/object/object_modifier.c
    branches/cycles/source/blender/editors/object/object_ops.c
    branches/cycles/source/blender/editors/object/object_relations.c
    branches/cycles/source/blender/editors/object/object_select.c
    branches/cycles/source/blender/editors/render/render_shading.c
    branches/cycles/source/blender/editors/screen/area.c
    branches/cycles/source/blender/editors/screen/screen_context.c
    branches/cycles/source/blender/editors/screen/screen_ops.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
    branches/cycles/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/cycles/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/cycles/source/blender/editors/sound/sound_intern.h
    branches/cycles/source/blender/editors/sound/sound_ops.c
    branches/cycles/source/blender/editors/space_file/file_draw.c
    branches/cycles/source/blender/editors/space_file/file_ops.c
    branches/cycles/source/blender/editors/space_file/filelist.c
    branches/cycles/source/blender/editors/space_graph/graph_ops.c
    branches/cycles/source/blender/editors/space_info/info_stats.c
    branches/cycles/source/blender/editors/space_logic/logic_ops.c
    branches/cycles/source/blender/editors/space_logic/logic_window.c
    branches/cycles/source/blender/editors/space_nla/nla_draw.c
    branches/cycles/source/blender/editors/space_nla/nla_select.c
    branches/cycles/source/blender/editors/space_node/drawnode.c
    branches/cycles/source/blender/editors/space_node/node_buttons.c
    branches/cycles/source/blender/editors/space_node/node_draw.c
    branches/cycles/source/blender/editors/space_node/node_edit.c
    branches/cycles/source/blender/editors/space_node/node_header.c
    branches/cycles/source/blender/editors/space_node/node_intern.h
    branches/cycles/source/blender/editors/space_node/node_ops.c
    branches/cycles/source/blender/editors/space_node/node_select.c
    branches/cycles/source/blender/editors/space_node/node_state.c
    branches/cycles/source/blender/editors/space_node/space_node.c
    branches/cycles/source/blender/editors/space_outliner/outliner_draw.c
    branches/cycles/source/blender/editors/space_outliner/outliner_edit.c
    branches/cycles/source/blender/editors/space_outliner/outliner_intern.h
    branches/cycles/source/blender/editors/space_outliner/outliner_select.c
    branches/cycles/source/blender/editors/space_outliner/outliner_tools.c
    branches/cycles/source/blender/editors/space_outliner/outliner_tree.c
    branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/cycles/source/blender/editors/space_sequencer/space_sequencer.c
    branches/cycles/source/blender/editors/space_text/text_draw.c
    branches/cycles/source/blender/editors/space_view3d/drawarmature.c
    branches/cycles/source/blender/editors/space_view3d/drawobject.c
    branches/cycles/source/blender/editors/space_view3d/drawvolume.c
    branches/cycles/source/blender/editors/space_view3d/view3d_buttons.c
    branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
    branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
    branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
    branches/cycles/source/blender/editors/space_view3d/view3d_view.c
    branches/cycles/source/blender/editors/transform/transform.c
    branches/cycles/source/blender/editors/transform/transform_constraints.c
    branches/cycles/source/blender/editors/transform/transform_conversions.c
    branches/cycles/source/blender/editors/transform/transform_generics.c
    branches/cycles/source/blender/editors/transform/transform_manipulator.c
    branches/cycles/source/blender/editors/transform/transform_orientations.c
    branches/cycles/source/blender/editors/transform/transform_snap.c
    branches/cycles/source/blender/editors/util/SConscript
    branches/cycles/source/blender/editors/util/undo.c
    branches/cycles/source/blender/gpu/GPU_extensions.h
    branches/cycles/source/blender/gpu/GPU_material.h
    branches/cycles/source/blender/gpu/SConscript
    branches/cycles/source/blender/gpu/intern/gpu_buffers.c
    branches/cycles/source/blender/gpu/intern/gpu_codegen.c
    branches/cycles/source/blender/gpu/intern/gpu_codegen.h
    branches/cycles/source/blender/gpu/intern/gpu_extensions.c
    branches/cycles/source/blender/gpu/intern/gpu_material.c
    branches/cycles/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/cycles/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/cycles/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/cycles/source/blender/imbuf/intern/cineon/logImageCore.h
    branches/cycles/source/blender/imbuf/intern/filter.c
    branches/cycles/source/blender/imbuf/intern/indexer.c
    branches/cycles/source/blender/imbuf/intern/iris.c
    branches/cycles/source/blender/imbuf/intern/jp2.c
    branches/cycles/source/blender/makesdna/DNA_action_types.h
    branches/cycles/source/blender/makesdna/DNA_actuator_types.h
    branches/cycles/source/blender/makesdna/DNA_customdata_types.h
    branches/cycles/source/blender/makesdna/DNA_meshdata_types.h
    branches/cycles/source/blender/makesdna/DNA_modifier_types.h
    branches/cycles/source/blender/makesdna/DNA_node_types.h
    branches/cycles/source/blender/makesdna/DNA_object_types.h
    branches/cycles/source/blender/makesdna/DNA_outliner_types.h
    branches/cycles/source/blender/makesdna/DNA_scene_types.h
    branches/cycles/source/blender/makesdna/DNA_sequence_types.h
    branches/cycles/source/blender/makesdna/DNA_space_types.h
    branches/cycles/source/blender/makesdna/DNA_userdef_types.h
    branches/cycles/source/blender/makesrna/RNA_access.h
    branches/cycles/source/blender/makesrna/RNA_enum_types.h
    branches/cycles/source/blender/makesrna/RNA_types.h
    branches/cycles/source/blender/makesrna/SConscript
    branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
    branches/cycles/source/blender/makesrna/intern/SConscript
    branches/cycles/source/blender/makesrna/intern/makesrna.c
    branches/cycles/source/blender/makesrna/intern/rna_ID.c
    branches/cycles/source/blender/makesrna/intern/rna_access.c
    branches/cycles/source/blender/makesrna/intern/rna_action.c
    branches/cycles/source/blender/makesrna/intern/rna_actuator.c
    branches/cycles/source/blender/makesrna/intern/rna_animation.c
    branches/cycles/source/blender/makesrna/intern/rna_armature.c
    branches/cycles/source/blender/makesrna/intern/rna_constraint.c
    branches/cycles/source/blender/makesrna/intern/rna_fcurve.c
    branches/cycles/source/blender/makesrna/intern/rna_fluidsim.c
    branches/cycles/source/blender/makesrna/intern/rna_internal.h
    branches/cycles/source/blender/makesrna/intern/rna_key.c
    branches/cycles/source/blender/makesrna/intern/rna_main_api.c
    branches/cycles/source/blender/makesrna/intern/rna_mesh.c
    branches/cycles/source/blender/makesrna/intern/rna_modifier.c
    branches/cycles/source/blender/makesrna/intern/rna_nla.c
    branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
    branches/cycles/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/cycles/source/blender/makesrna/intern/rna_object.c
    branches/cycles/source/blender/makesrna/intern/rna_particle.c
    branches/cycles/source/blender/makesrna/intern/rna_pose.c
    branches/cycles/source/blender/makesrna/intern/rna_property.c
    branches/cycles/source/blender/makesrna/intern/rna_rna.c
    branches/cycles/source/blender/makesrna/intern/rna_scene.c
    branches/cycles/source/blender/makesrna/intern/rna_scene_api.c
    branches/cycles/source/blender/makesrna/intern/rna_screen.c
    branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
    branches/cycles/source/blender/makesrna/intern/rna_smoke.c
    branches/cycles/source/blender/makesrna/intern/rna_space.c
    branches/cycles/source/blender/makesrna/intern/rna_text.c
    branches/cycles/source/blender/makesrna/intern/rna_texture.c
    branches/cycles/source/blender/makesrna/intern/rna_texture_api.c
    branches/cycles/source/blender/makesrna/intern/rna_ui_api.c
    branches/cycles/source/blender/makesrna/intern/rna_userdef.c
    branches/cycles/source/blender/makesrna/intern/rna_wm.c
    branches/cycles/source/blender/makesrna/intern/rna_world.c
    branches/cycles/source/blender/modifiers/CMakeLists.txt
    branches/cycles/source/blender/modifiers/MOD_modifiertypes.h
    branches/cycles/source/blender/modifiers/SConscript
    branches/cycles/source/blender/modifiers/intern/MOD_screw.c
    branches/cycles/source/blender/modifiers/intern/MOD_util.c
    branches/cycles/source/blender/modifiers/intern/MOD_warp.c
    branches/cycles/source/blender/nodes/CMakeLists.txt
    branches/cycles/source/blender/nodes/SConscript
    branches/cycles/source/blender/nodes/intern/node_util.c
    branches/cycles/source/blender/nodes/intern/node_util.h
    branches/cycles/source/blender/python/SConscript
    branches/cycles/source/blender/python/generic/bpy_internal_import.c
    branches/cycles/source/blender/python/generic/py_capi_utils.c
    branches/cycles/source/blender/python/generic/py_capi_utils.h
    branches/cycles/source/blender/python/intern/CMakeLists.txt
    branches/cycles/source/blender/python/intern/bpy_app_handlers.c
    branches/cycles/source/blender/python/intern/bpy_driver.c
    branches/cycles/source/blender/python/intern/bpy_interface.c
    branches/cycles/source/blender/python/intern/bpy_rna.c
    branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
    branches/cycles/source/blender/render/extern/include/RE_render_ext.h
    branches/cycles/source/blender/render/intern/include/pixelshading.h
    branches/cycles/source/blender/render/intern/include/render_types.h
    branches/cycles/source/blender/render/intern/include/rendercore.h
    branches/cycles/source/blender/render/intern/include/renderdatabase.h
    branches/cycles/source/blender/render/intern/include/shadbuf.h
    branches/cycles/source/blender/render/intern/include/shading.h
    branches/cycles/source/blender/render/intern/include/texture.h
    branches/cycles/source/blender/render/intern/include/volumetric.h
    branches/cycles/source/blender/render/intern/include/zbuf.h
    branches/cycles/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/cycles/source/blender/render/intern/source/convertblender.c
    branches/cycles/source/blender/render/intern/source/envmap.c
    branches/cycles/source/blender/render/intern/source/imagetexture.c
    branches/cycles/source/blender/render/intern/source/occlusion.c
    branches/cycles/source/blender/render/intern/source/pipeline.c
    branches/cycles/source/blender/render/intern/source/pixelshading.c
    branches/cycles/source/blender/render/intern/source/render_texture.c
    branches/cycles/source/blender/render/intern/source/rendercore.c
    branches/cycles/source/blender/render/intern/source/renderdatabase.c
    branches/cycles/source/blender/render/intern/source/shadbuf.c
    branches/cycles/source/blender/render/intern/source/shadeinput.c
    branches/cycles/source/blender/render/intern/source/shadeoutput.c
    branches/cycles/source/blender/render/intern/source/sss.c
    branches/cycles/source/blender/render/intern/source/volume_precache.c
    branches/cycles/source/blender/render/intern/source/volumetric.c
    branches/cycles/source/blender/render/intern/source/zbuf.c
    branches/cycles/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
    branches/cycles/source/blender/windowmanager/intern/wm_keymap.c
    branches/cycles/source/blender/windowmanager/intern/wm_operators.c
    branches/cycles/source/blenderplayer/CMakeLists.txt
    branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/cycles/source/creator/CMakeLists.txt
    branches/cycles/source/creator/creator.c
    branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/cycles/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/cycles/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/cycles/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/cycles/source/gameengine/Converter/BL_MeshDeformer.h
    branches/cycles/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/cycles/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/cycles/source/gameengine/Converter/CMakeLists.txt
    branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/cycles/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/cycles/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/cycles/source/gameengine/Converter/SConscript
    branches/cycles/source/gameengine/Expressions/IfExpr.h
    branches/cycles/source/gameengine/Expressions/ListValue.cpp
    branches/cycles/source/gameengine/Expressions/Value.cpp
    branches/cycles/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/cycles/source/gameengine/GameLogic/SCA_IActuator.h
    branches/cycles/source/gameengine/GameLogic/SCA_PythonController.h
    branches/cycles/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/cycles/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/cycles/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/cycles/source/gameengine/GamePlayer/xembed/npunix.c
    branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
    branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/cycles/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/cycles/source/gameengine/Ketsji/KX_GameObject.h
    branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/cycles/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/cycles/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonInit.h
    branches/cycles/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/cycles/source/gameengine/Ketsji/KX_Scene.cpp
    branches/cycles/source/gameengine/Ketsji/KX_Scene.h
    branches/cycles/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/cycles/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/cycles/source/gameengine/Ketsji/SConscript
    branches/cycles/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/cycles/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/cycles/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/cycles/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/cycles/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/cycles/source/gameengine/SceneGraph/SG_DList.h
    branches/cycles/source/gameengine/SceneGraph/SG_IObject.h
    branches/cycles/source/gameengine/SceneGraph/SG_QList.h
    branches/cycles/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/cycles/source/gameengine/VideoTexture/CMakeLists.txt
    branches/cycles/source/gameengine/VideoTexture/Exception.h
    branches/cycles/source/gameengine/VideoTexture/ImageBase.cpp
    branches/cycles/source/gameengine/VideoTexture/ImageRender.cpp
    branches/cycles/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/cycles/build_files/cmake/Modules/FindPCRE.cmake
    branches/cycles/build_files/cmake/Modules/FindXML2.cmake
    branches/cycles/build_files/cmake/cmake_static_check_cppcheck.py
    branches/cycles/build_files/cmake/cmake_static_check_sparse.py
    branches/cycles/build_files/cmake/cmake_static_check_splint.py
    branches/cycles/build_files/cmake/project_source_info.py
    branches/cycles/doc/python_api/rst/gpu.rst
    branches/cycles/doc/python_api/rst/info_best_practice.rst
    branches/cycles/extern/recastnavigation/
    branches/cycles/extern/recastnavigation/CMakeLists.txt
    branches/cycles/extern/recastnavigation/Detour/
    branches/cycles/extern/recastnavigation/Detour/Include/
    branches/cycles/extern/recastnavigation/Detour/Include/DetourCommon.h
    branches/cycles/extern/recastnavigation/Detour/Include/DetourNode.h
    branches/cycles/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    branches/cycles/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
    branches/cycles/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    branches/cycles/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
    branches/cycles/extern/recastnavigation/Detour/Source/
    branches/cycles/extern/recastnavigation/Detour/Source/DetourCommon.cpp
    branches/cycles/extern/recastnavigation/Detour/Source/DetourNode.cpp
    branches/cycles/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/cycles/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
    branches/cycles/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
    branches/cycles/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
    branches/cycles/extern/recastnavigation/License.txt
    branches/cycles/extern/recastnavigation/Readme.txt
    branches/cycles/extern/recastnavigation/Recast/
    branches/cycles/extern/recastnavigation/Recast/Include/
    branches/cycles/extern/recastnavigation/Recast/Include/Recast.h
    branches/cycles/extern/recastnavigation/Recast/Include/RecastLog.h
    branches/cycles/extern/recastnavigation/Recast/Include/RecastTimer.h
    branches/cycles/extern/recastnavigation/Recast/Source/
    branches/cycles/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastLog.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/cycles/extern/recastnavigation/Recast/Source/RecastTimer.cpp
    branches/cycles/extern/recastnavigation/SConscript
    branches/cycles/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/cycles/source/blender/blenkernel/intern/navmesh_conversion.cpp
    branches/cycles/source/blender/blenlib/intern/string_utf8.c
    branches/cycles/source/blender/collada/ErrorHandler.cpp
    branches/cycles/source/blender/collada/ErrorHandler.h
    branches/cycles/source/blender/collada/ExportSettings.cpp
    branches/cycles/source/blender/collada/ExportSettings.h
    branches/cycles/source/blender/collada/SceneExporter.cpp
    branches/cycles/source/blender/collada/SceneExporter.h
    branches/cycles/source/blender/editors/gpencil/gpencil_undo.c
    branches/cycles/source/blender/editors/object/object_navmesh.cpp
    branches/cycles/source/blender/modifiers/intern/MOD_navmesh.cpp
    branches/cycles/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/cycles/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/cycles/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/cycles/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/cycles/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/cycles/source/blender/nodes/NOD_composite.h
    branches/cycles/source/blender/nodes/NOD_shader.h
    branches/cycles/source/blender/nodes/NOD_socket.h
    branches/cycles/source/blender/nodes/NOD_texture.h
    branches/cycles/source/blender/nodes/composite/
    branches/cycles/source/blender/nodes/composite/node_composite_tree.c
    branches/cycles/source/blender/nodes/composite/node_composite_util.c
    branches/cycles/source/blender/nodes/composite/node_composite_util.h
    branches/cycles/source/blender/nodes/composite/nodes/
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/cycles/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/cycles/source/blender/nodes/intern/node_common.c
    branches/cycles/source/blender/nodes/intern/node_common.h
    branches/cycles/source/blender/nodes/intern/node_exec.c
    branches/cycles/source/blender/nodes/intern/node_exec.h
    branches/cycles/source/blender/nodes/intern/node_socket.c
    branches/cycles/source/blender/nodes/shader/
    branches/cycles/source/blender/nodes/shader/node_shader_tree.c
    branches/cycles/source/blender/nodes/shader/node_shader_util.c
    branches/cycles/source/blender/nodes/shader/node_shader_util.h
    branches/cycles/source/blender/nodes/shader/nodes/
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/cycles/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/cycles/source/blender/nodes/texture/
    branches/cycles/source/blender/nodes/texture/node_texture_tree.c
    branches/cycles/source/blender/nodes/texture/node_texture_util.c
    branches/cycles/source/blender/nodes/texture/node_texture_util.h
    branches/cycles/source/blender/nodes/texture/nodes/
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/cycles/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/cycles/source/blender/python/intern/gpu.c
    branches/cycles/source/blender/python/intern/gpu.h
    branches/cycles/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/cycles/source/gameengine/Ketsji/KX_NavMeshObject.h
    branches/cycles/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/cycles/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/cycles/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/cycles/source/gameengine/Ketsji/KX_SteeringActuator.h

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

Property Changed:
----------------
    branches/cycles/
    branches/cycles/source/blender/editors/space_outliner/
    branches/cycles/source/blender/python/intern/


Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:37695-37700
/trunk/blender:36353-39870
   + /trunk:37695-37700
/trunk/blender:36353-40267

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/CMakeLists.txt	2011-09-17 13:28:40 UTC (rev 40298)
@@ -474,15 +474,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()
@@ -705,11 +698,7 @@
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INC ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
-			if(CMAKE_CL_64)
-				set(GETTEXT_LIB gettext)
-			else()
-				set(GETTEXT_LIB gnu_gettext)
-			endif()
+			set(GETTEXT_LIB gnu_gettext)
 		endif()
 
 		if(CMAKE_CL_64)
@@ -765,7 +754,7 @@
 				${LIBDIR}/opencollada/lib/ftoa.lib
 				${LIBDIR}/opencollada/lib/UTF.lib
 			)
-			set(PCRE_LIB
+			set(PCRE_LIBRARIES
 				${LIBDIR}/opencollada/lib/pcre.lib
 			)
 		endif()
@@ -875,7 +864,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)
@@ -929,7 +918,7 @@
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			set(PCRE_LIB pcre)
+			set(PCRE_LIBRARIES pcre)
 		endif()
 		
 		if(WITH_CODEC_FFMPEG)
@@ -1173,7 +1162,7 @@
 		#pcre is bundled with openCollada
 		#set(PCRE ${LIBDIR}/pcre)
 		#set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
+		set(PCRE_LIBRARIES pcre)
 		#libxml2 is used
 		#set(EXPAT ${LIBDIR}/expat)
 		#set(EXPAT_LIBPATH ${EXPAT}/lib)
@@ -1383,6 +1372,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)
@@ -1390,6 +1380,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/cycles/GNUmakefile
===================================================================
--- branches/cycles/GNUmakefile	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/GNUmakefile	2011-09-17 13:28:40 UTC (rev 40298)
@@ -126,6 +126,11 @@
 	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
 	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
 	@echo ""
+	@echo "Static Source Code Checking (not assosiated with building blender)"
+	@echo "  * check_cppcheck  - run blender source through cppcheck (C & C++)"
+	@echo "  * check_splint    - run blenders source through splint (C only)"
+	@echo "  * check_sparse    - run blenders source through sparse (C only)"
+	@echo ""
 
 # -----------------------------------------------------------------------------
 # Packages
@@ -176,6 +181,20 @@
 	cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
 
 
+# -----------------------------------------------------------------------------
+# Static Checking
+#
+
+check_cppcheck:
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+
+check_splint:
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+
+check_sparse:
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+
+
 clean:
 	$(MAKE) -C $(BUILD_DIR) clean
 

Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/SConstruct	2011-09-17 13:28:40 UTC (rev 40298)
@@ -645,7 +645,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     dllsources = []
 
-    if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+    if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
         # For MinGW and linuxcross static linking will be used
         dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
 

Modified: branches/cycles/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-i686.py	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/build_files/buildbot/config/user-config-i686.py	2011-09-17 13:28:40 UTC (rev 40298)
@@ -87,6 +87,10 @@
 BF_3DMOUSE = '/home/sources/staticlibs/spnav'
 BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
 
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CFLAGS = ['-O2']

Modified: branches/cycles/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-x86_64.py	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/build_files/buildbot/config/user-config-x86_64.py	2011-09-17 13:28:40 UTC (rev 40298)
@@ -87,6 +87,10 @@
 BF_3DMOUSE = '/home/sources/staticlibs/spnav'
 BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
 
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
 # Compilation and optimization
 BF_DEBUG = False
 REL_CFLAGS = ['-O2']

Modified: branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-17 13:22:13 UTC (rev 40297)
+++ branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-17 13:28:40 UTC (rev 40298)
@@ -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
+    )
+  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+  IF(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/cycles/build_files/cmake/Modules/FindPCRE.cmake (from rev 40050, trunk/blender/build_files/cmake/Modules/FindPCRE.cmake)
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindPCRE.cmake	                        (rev 0)
+++ branches/cycles/build_files/cmake/Modules/FindPCRE.cmake	2011-09-17 13:28:40 UTC (rev 40298)
@@ -0,0 +1,69 @@
+# - Find PCRE library
+# Find the native PCRE includes and library
+# This module defines
+#  PCRE_INCLUDE_DIRS, where to find pcre.h, Set when
+#                     PCRE_INCLUDE_DIR is found.
+#  PCRE_LIBRARIES, libraries to link against to use PCRE.
+#  PCRE_ROOT_DIR, The base directory to search for PCRE.
+#                 This can also be an environment variable.
+#  PCRE_FOUND, If false, do not try to use PCRE.
+#
+# also defined, but not for general use are
+#  PCRE_LIBRARY, where to find the PCRE library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If PCRE_ROOT_DIR was defined in the environment, use it.
+IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
+  SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})
+ENDIF()
+
+SET(_pcre_SEARCH_DIRS
+  ${PCRE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+)
+
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+  HINTS
+    ${_pcre_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+    include
+)
+
+FIND_LIBRARY(PCRE_LIBRARY
+  NAMES
+    pcre
+  HINTS
+    ${_pcre_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if 
+# all listed variables are TRUE

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list