Revision: 51235
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51235
Author: genscher
Date: 2012-10-09 19:53:51 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Merging revisions 51077-51234 from trunk
Modified Paths:
--------------
branches/soc-2012-fried_chicken/CMakeLists.txt
branches/soc-2012-fried_chicken/GNUmakefile
branches/soc-2012-fried_chicken/SConstruct
branches/soc-2012-fried_chicken/build_files/buildbot/master.cfg
branches/soc-2012-fried_chicken/build_files/buildbot/master_unpack.py
branches/soc-2012-fried_chicken/build_files/buildbot/slave_pack.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_static_check_smatch.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_static_check_splint.py
branches/soc-2012-fried_chicken/build_files/cmake/config/blender_lite.cmake
branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake
branches/soc-2012-fried_chicken/build_files/cmake/project_source_info.py
branches/soc-2012-fried_chicken/doc/guides/interface_API.txt
branches/soc-2012-fried_chicken/doc/python_api/rst/bge.types.rst
branches/soc-2012-fried_chicken/doc/python_api/rst/change_log.rst
branches/soc-2012-fried_chicken/doc/python_api/sphinx_changelog_gen.py
branches/soc-2012-fried_chicken/doc/python_api/sphinx_doc_gen.py
branches/soc-2012-fried_chicken/intern/cycles/blender/addon/ui.py
branches/soc-2012-fried_chicken/intern/cycles/blender/blender_object.cpp
branches/soc-2012-fried_chicken/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_bvh.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_camera.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_object.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_path.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_shader.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/kernel_types.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/background.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_phong.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/bssrdf.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/debug.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/emissive.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/soc-2012-fried_chicken/intern/cycles/kernel/svm/svm_types.h
branches/soc-2012-fried_chicken/intern/cycles/render/camera.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/light.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/mesh.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/nodes.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/object.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/svm.cpp
branches/soc-2012-fried_chicken/intern/cycles/util/util_thread.h
branches/soc-2012-fried_chicken/intern/dualcon/intern/octree.cpp
branches/soc-2012-fried_chicken/intern/dualcon/intern/octree.h
branches/soc-2012-fried_chicken/intern/elbeem/intern/utilities.cpp
branches/soc-2012-fried_chicken/intern/tools/bpy_introspect_ui.py
branches/soc-2012-fried_chicken/intern/tools/credits_svn_gen.py
branches/soc-2012-fried_chicken/release/datafiles/startup.blend
branches/soc-2012-fried_chicken/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy/path.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_types.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpyml.py
branches/soc-2012-fried_chicken/release/scripts/modules/console_python.py
branches/soc-2012-fried_chicken/release/scripts/modules/console_shell.py
branches/soc-2012-fried_chicken/release/scripts/modules/rna_info.py
branches/soc-2012-fried_chicken/release/scripts/modules/rna_xml.py
branches/soc-2012-fried_chicken/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/anim.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/clip.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/console.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/mesh.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/object.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/__init__.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_console.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_info.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-fried_chicken/release/scripts/startup/keyingsets_builtins.py
branches/soc-2012-fried_chicken/source/blender/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/avi/AVI_avi.h
branches/soc-2012-fried_chicken/source/blender/avi/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_armature.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_gpencil.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_key.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mball.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_multires.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/displist.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/font.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/gpencil.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/lattice.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mball.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/modifier.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/node.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/scene.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/writeavi.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/nla_private.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_bpath.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_dlrbTree.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_endian_switch_inline.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_fileops.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_lasso.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/fileops.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/lasso.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2012-fried_chicken/source/blender/collada/DocumentExporter.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Node.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ChannelMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ChromaMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorSpillNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DistanceMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_FilterNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MapValueNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MaskNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MovieClipNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_NormalNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_TransformNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
branches/soc-2012-fried_chicken/source/blender/editors/animation/anim_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/animation/keyframing.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/editarmature.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/meshlaplacian.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/poseSlide.c
branches/soc-2012-fried_chicken/source/blender/editors/curve/editcurve.c
branches/soc-2012-fried_chicken/source/blender/editors/curve/editfont.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_anim_api.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_armature.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_mesh.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_object.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_particle.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_view3d.h
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_layout.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editface.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_add.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/mesh_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/mesh/meshtools.c
branches/soc-2012-fried_chicken/source/blender/editors/metaball/mball_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_add.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_constraint.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/object/object_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_transform.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_vgroup.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/particle_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_update.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/area.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_action/action_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_action/space_action.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/file_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/filelist.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/space_image.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/space_node.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2012-fried_chicken/source/blender/editors/space_text/text_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_text/text_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.h
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_snap.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2012-fried_chicken/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-fried_chicken/source/blender/ikplugin/BIK_api.h
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/ikplugin_api.h
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/iksolver_plugin.h
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/itasc_plugin.h
branches/soc-2012-fried_chicken/source/blender/imbuf/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/colormanagement.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/Color.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/Image.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/PixelFormat.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/Stream.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/indexer.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/util.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-fried_chicken/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_curve.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_particle.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_render.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_texture.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-fried_chicken/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2012-fried_chicken/source/blender/python/generic/py_capi_utils.c
branches/soc-2012-fried_chicken/source/blender/python/generic/py_capi_utils.h
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_app.h
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_app_ffmpeg.h
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_app_handlers.h
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_driver.h
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_traceback.h
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_noise.h
branches/soc-2012-fried_chicken/source/blender/python/rna_dump.py
branches/soc-2012-fried_chicken/source/blender/quicktime/quicktime_export.h
branches/soc-2012-fried_chicken/source/blender/quicktime/quicktime_import.h
branches/soc-2012-fried_chicken/source/blender/render/intern/include/texture.h
branches/soc-2012-fried_chicken/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2012-fried_chicken/source/blender/render/intern/source/convertblender.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/occlusion.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/pipeline.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/pointdensity.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/render_texture.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/rendercore.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/renderdatabase.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/shadeinput.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/shadeoutput.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/sss.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/zbuf.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/WM_api.h
branches/soc-2012-fried_chicken/source/blender/windowmanager/WM_types.h
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2012-fried_chicken/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ArmatureChannel.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_ConvertActuators.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_ConvertControllers.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_ConvertProperties.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_ConvertSensors.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_IpoConvert.h
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/BoolValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/ConstExpr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/EXP_C-Api.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/EmptyValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/ErrorValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/Expression.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/FloatValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/IdentifierExpr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/IfExpr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/IntValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/KX_HashedPtr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/KX_Python.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/ListValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/Operator1Expr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/Operator2Expr.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/StringValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/Value.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/VectorValue.h
branches/soc-2012-fried_chicken/source/gameengine/Expressions/VoidValue.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ANDController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_BasicEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_MouseManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_NANDController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_NORController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ORController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_XNORController.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_XORController.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_System.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Action.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_EmptyObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Light.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_MotionState.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PyConstraintBinding.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PythonSeq.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_WorldInfo.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/soc-2012-fried_chicken/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/soc-2012-fried_chicken/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2012-fried_chicken/source/gameengine/Network/NG_NetworkMessage.h
branches/soc-2012-fried_chicken/source/gameengine/Network/NG_NetworkObject.h
branches/soc-2012-fried_chicken/source/gameengine/Network/NG_NetworkScene.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2012-fried_chicken/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-fried_chicken/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IController.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IMotionState.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_IVehicle.h
branches/soc-2012-fried_chicken/source/gameengine/Physics/common/PHY_Pro.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_LightObject.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_ObjectColor.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_Rect.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_TexMatrix.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_Controller.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_QList.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_Spatial.h
branches/soc-2012-fried_chicken/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2012-fried_chicken/source/tests/batch_import.py
branches/soc-2012-fried_chicken/source/tests/bl_load_addons.py
branches/soc-2012-fried_chicken/source/tests/bl_load_py_modules.py
branches/soc-2012-fried_chicken/source/tests/bl_mesh_modifiers.py
branches/soc-2012-fried_chicken/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2012-fried_chicken/build_files/cmake/clang_array_check.py
branches/soc-2012-fried_chicken/build_files/cmake/cmake_static_check_clang_array.py
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_codecs.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_endian.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_endian.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_mjpeg.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_mjpeg.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_options.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_rgb.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_rgb.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_rgb32.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avi_rgb32.h
Removed Paths:
-------------
branches/soc-2012-fried_chicken/source/blender/avi/intern/avirgb.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/avirgb.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/codecs.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/endian.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/endian.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/mjpeg.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/mjpeg.h
branches/soc-2012-fried_chicken/source/blender/avi/intern/options.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/rgb32.c
branches/soc-2012-fried_chicken/source/blender/avi/intern/rgb32.h
Property Changed:
----------------
branches/soc-2012-fried_chicken/build_files/cmake/
Modified: branches/soc-2012-fried_chicken/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/CMakeLists.txt 2012-10-09 18:56:02 UTC
(rev 51234)
+++ branches/soc-2012-fried_chicken/CMakeLists.txt 2012-10-09 19:53:51 UTC
(rev 51235)
@@ -206,6 +206,7 @@
option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for
rendering" ON)
# Audio/Video format support
+option(WITH_CODEC_AVI "Enable Blenders own AVI file support
(raw/jpeg)" ON)
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)"
OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support
(http://www.mega-nerd.com/libsndfile)" OFF)
@@ -254,6 +255,9 @@
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
+# LLVM
+option(WITH_LLVM "Use LLVM" OFF)
+
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement
(http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
@@ -316,6 +320,9 @@
option(WITH_COCOA "Use Cocoa framework instead of deprecated
Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime
(needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
+ if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+ set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit
+ endif()
endif()
@@ -371,6 +378,11 @@
set(WITH_BOOST ON)
endif()
+# auto enable llvm for cycles_osl
+if(WITH_CYCLES_OSL)
+ set(WITH_LLVM ON CACHE BOOL "ON" FORCE)
+endif()
+
# don't store paths to libs for portable distribution
if(WITH_INSTALL_PORTABLE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
@@ -704,6 +716,56 @@
endif()
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the
LLVM installation")
+ set(LLVM_VERSION "3.0" CACHE STRING "Version of LLVM to
use" "")
+ set(LLVM_STATIC YES)
+ if(LLVM_DIRECTORY)
+ set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
+ else()
+ set(LLVM_CONFIG llvm-config)
+ endif()
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIB_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --includedir
+ OUTPUT_VARIABLE LLVM_INCLUDES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_library(LLVM_LIBRARY
+ NAMES libLLVMAnalysis.a # first of a whole bunch
of libs to get
+ PATHS ${LLVM_LIB_DIR})
+ message(STATUS "LLVM version = ${LLVM_VERSION}")
+ message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message(STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+
+ if(LLVM_LIBRARY AND LLVM_INCLUDES AND LLVM_DIRECTORY AND
LLVM_LIB_DIR)
+ # ensure include directory is added (in case of
non-standard locations
+ include_directories(BEFORE "${LLVM_INCLUDES}")
+ string(REGEX REPLACE "\\." "" OSL_LLVM_VERSION
${LLVM_VERSION})
+ message(STATUS "LLVM OSL_LLVM_VERSION =
${OSL_LLVM_VERSION}")
+
add_definitions("-DOSL_LLVM_VERSION=${OSL_LLVM_VERSION}")
+ if(LLVM_STATIC)
+ # if static LLVM libraries were requested, use
llvm-config to generate
+ # the list of what libraries we need, and
substitute that in the right
+ # way for LLVM_LIBRARY.
+ execute_process(COMMAND ${LLVM_CONFIG}
--libfiles
+ OUTPUT_VARIABLE LLVM_LIBRARY
+
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE " " ";" LLVM_LIBRARY
${LLVM_LIBRARY})
+ endif()
+ message(STATUS "LLVM library = ${LLVM_LIBRARY}")
+ else()
+ message(FATAL_ERROR "LLVM not found.")
+ endif()
+ endif()
+
if(WITH_CYCLES_OSL)
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to
OpenShadingLanguage installation")
@@ -712,8 +774,9 @@
find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_QUERY NAMES oslquery PATHS
${CYCLES_OSL}/lib)
- # WARNING! depends on correct order of OSL libs linking
- list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC}
${OSL_LIB_QUERY})
+ # Note: --whole-archive is needed to force loading of all
symbols in liboslexec,
+ # otherwise LLVM is missing the osl_allocate_closure_component
function
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -Wl,--whole-archive
${OSL_LIB_EXEC} -Wl,--no-whole-archive ${OSL_LIB_QUERY})
find_path(OSL_INCLUDES OSL/oslclosure.h PATHS
${CYCLES_OSL}/include)
find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
@@ -1559,6 +1622,56 @@
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the
LLVM installation")
+ set(LLVM_VERSION "3.1" CACHE STRING "Version of LLVM to
use" "")
+ set(LLVM_STATIC YES)
+ if(LLVM_DIRECTORY)
+ set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
+ else()
+ set(LLVM_CONFIG llvm-config)
+ endif()
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIB_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${LLVM_CONFIG} --includedir
+ OUTPUT_VARIABLE LLVM_INCLUDES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_library(LLVM_LIBRARY
+ NAMES libLLVMAnalysis.a # first of a whole bunch
of libs to get
+ PATHS ${LLVM_LIB_DIR})
+ message(STATUS "LLVM version = ${LLVM_VERSION}")
+ message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message(STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+
+ if(LLVM_LIBRARY AND LLVM_INCLUDES AND LLVM_DIRECTORY AND
LLVM_LIB_DIR)
+ # ensure include directory is added (in case of
non-standard locations
+ include_directories(BEFORE "${LLVM_INCLUDES}")
+ string(REGEX REPLACE "\\." "" OSL_LLVM_VERSION
${LLVM_VERSION})
+ message(STATUS "LLVM OSL_LLVM_VERSION =
${OSL_LLVM_VERSION}")
+
add_definitions("-DOSL_LLVM_VERSION=${OSL_LLVM_VERSION}")
+ if(LLVM_STATIC)
+ # if static LLVM libraries were requested, use
llvm-config to generate
+ # the list of what libraries we need, and
substitute that in the right
+ # way for LLVM_LIBRARY.
+ execute_process(COMMAND ${LLVM_CONFIG}
--libfiles
+ OUTPUT_VARIABLE LLVM_LIBRARY
+
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE " " ";" LLVM_LIBRARY
${LLVM_LIBRARY})
+ endif()
+ message(STATUS "LLVM library = ${LLVM_LIBRARY}")
+ else()
+ message(FATAL_ERROR "LLVM not found.")
+ endif()
+ endif()
+
if(WITH_CYCLES_OSL)
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to
OpenShadingLanguage installation")
@@ -1582,66 +1695,6 @@
endif()
include_directories(${OSL_INCLUDES})
-
-
- # LLVM library setup, needed for osl
-
- set(LLVM_DIRECTORY "${LIBDIR}/llvm")
- set(LLVM_STATIC YES)
- if (LLVM_DIRECTORY)
- set (LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
- else ()
- set (LLVM_CONFIG llvm-config)
- endif ()
- execute_process (COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process (COMMAND ${LLVM_CONFIG} --prefix
- OUTPUT_VARIABLE LLVM_DIRECTORY
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process (COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process (COMMAND ${LLVM_CONFIG} --includedir
- OUTPUT_VARIABLE LLVM_INCLUDES
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- find_library ( LLVM_LIBRARY
- NAMES libLLVMAnalysis.a # first of a
whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
- message (STATUS "LLVM version = ${LLVM_VERSION}")
- message (STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message (STATUS "LLVM includes = ${LLVM_INCLUDES}")
- message (STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
-
- if (LLVM_LIBRARY AND LLVM_INCLUDES AND LLVM_DIRECTORY AND
LLVM_LIB_DIR)
- # ensure include directory is added (in case of non-standard
locations
- include_directories (BEFORE "${LLVM_INCLUDES}")
- string (REGEX REPLACE "\\." "" OSL_LLVM_VERSION
${LLVM_VERSION})
- message (STATUS "LLVM OSL_LLVM_VERSION = ${OSL_LLVM_VERSION}")
- add_definitions ("-DOSL_LLVM_VERSION=${OSL_LLVM_VERSION}")
- if (LLVM_STATIC)
- # if static LLVM libraries were requested, use
llvm-config to generate
- # the list of what libraries we need, and substitute
that in the right
- # way for LLVM_LIBRARY.
- set (LLVM_LIBRARY "")
- execute_process (COMMAND ${LLVM_CONFIG} --libs
- OUTPUT_VARIABLE
llvm_library_list
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string (REPLACE "-l" "" llvm_library_list
${llvm_library_list})
- string (REPLACE " " ";" llvm_library_list
${llvm_library_list})
- foreach (f ${llvm_library_list})
- list (APPEND LLVM_LIBRARY "${LLVM_LIB_DIR}/lib${f}.a")
- endforeach ()
- endif ()
- string (REPLACE ";" " " LLVM_LIBRARY "${LLVM_LIBRARY}")
- message (STATUS "LLVM library = ${LLVM_LIBRARY}")
- else ()
- message (FATAL_ERROR "LLVM not found.")
- endif ()
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${LLVM_LIBRARY}")
-
- # end LLVM library setup
-
endif()
set(EXETYPE MACOSX_BUNDLE)
@@ -1677,6 +1730,12 @@
if(NOT WITH_BOOST)
message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may
not have been found. Configure BOOST or disable WITH_CYCLES")
endif()
+
+ if(WITH_CYCLES_OSL)
+ if(NOT WITH_LLVM)
+ message(FATAL_ERROR "Cycles OSL reqires WITH_LLVM, the
library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
+ endif()
+ endif()
endif()
@@ -2065,6 +2124,7 @@
info_cfg_option(WITH_OPENAL)
info_cfg_option(WITH_SDL)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
