Revision: 50210
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50210
Author: genscher
Date: 2012-08-25 22:43:41 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
Merge from trunk r49905-r50209
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49905
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50209
Modified Paths:
--------------
branches/cloth-eltopo/CMakeLists.txt
branches/cloth-eltopo/GNUmakefile
branches/cloth-eltopo/build_files/cmake/config/blender_lite.cmake
branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
branches/cloth-eltopo/build_files/scons/tools/Blender.py
branches/cloth-eltopo/build_files/scons/tools/btools.py
branches/cloth-eltopo/doc/python_api/rst/info_best_practice.rst
branches/cloth-eltopo/doc/python_api/rst/info_gotcha.rst
branches/cloth-eltopo/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/cloth-eltopo/intern/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/bvh/bvh.cpp
branches/cloth-eltopo/intern/ghost/GHOST_C-api.h
branches/cloth-eltopo/intern/guardedalloc/MEM_guardedalloc.h
branches/cloth-eltopo/intern/guardedalloc/intern/mallocn.c
branches/cloth-eltopo/intern/iksolver/CMakeLists.txt
branches/cloth-eltopo/intern/iksolver/SConscript
branches/cloth-eltopo/release/scripts/modules/addon_utils.py
branches/cloth-eltopo/release/scripts/modules/blend_render_info.py
branches/cloth-eltopo/release/scripts/modules/bpy/path.py
branches/cloth-eltopo/release/scripts/modules/bpy/utils.py
branches/cloth-eltopo/release/scripts/modules/bpy_extras/anim_utils.py
branches/cloth-eltopo/release/scripts/modules/console_python.py
branches/cloth-eltopo/release/scripts/modules/rna_xml.py
branches/cloth-eltopo/release/scripts/startup/bl_operators/console.py
branches/cloth-eltopo/release/scripts/startup/bl_operators/node.py
branches/cloth-eltopo/release/scripts/startup/bl_operators/wm.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_animviz.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_data_curve.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_mask_common.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_particle.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_physics_field.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_console.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_image.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_sequencer.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_userpref.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_view3d.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cloth-eltopo/release/scripts/templates/addon_add_object.py
branches/cloth-eltopo/release/scripts/templates/operator_mesh_add.py
branches/cloth-eltopo/source/blender/blenfont/intern/blf_dir.c
branches/cloth-eltopo/source/blender/blenfont/intern/blf_font.c
branches/cloth-eltopo/source/blender/blenfont/intern/blf_glyph.c
branches/cloth-eltopo/source/blender/blenkernel/BKE_colortools.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_context.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_fcurve.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_font.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_mask.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_material.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_mball.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_node.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_object.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_packedFile.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_screen.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_sequencer.h
branches/cloth-eltopo/source/blender/blenkernel/CMakeLists.txt
branches/cloth-eltopo/source/blender/blenkernel/intern/CCGSubSurf.c
branches/cloth-eltopo/source/blender/blenkernel/intern/CCGSubSurf.h
branches/cloth-eltopo/source/blender/blenkernel/intern/DerivedMesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/anim.c
branches/cloth-eltopo/source/blender/blenkernel/intern/armature.c
branches/cloth-eltopo/source/blender/blenkernel/intern/boids.c
branches/cloth-eltopo/source/blender/blenkernel/intern/brush.c
branches/cloth-eltopo/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/colortools.c
branches/cloth-eltopo/source/blender/blenkernel/intern/constraint.c
branches/cloth-eltopo/source/blender/blenkernel/intern/curve.c
branches/cloth-eltopo/source/blender/blenkernel/intern/customdata.c
branches/cloth-eltopo/source/blender/blenkernel/intern/depsgraph.c
branches/cloth-eltopo/source/blender/blenkernel/intern/dynamicpaint.c
branches/cloth-eltopo/source/blender/blenkernel/intern/editderivedmesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/fcurve.c
branches/cloth-eltopo/source/blender/blenkernel/intern/font.c
branches/cloth-eltopo/source/blender/blenkernel/intern/gpencil.c
branches/cloth-eltopo/source/blender/blenkernel/intern/group.c
branches/cloth-eltopo/source/blender/blenkernel/intern/idprop.c
branches/cloth-eltopo/source/blender/blenkernel/intern/image.c
branches/cloth-eltopo/source/blender/blenkernel/intern/ipo.c
branches/cloth-eltopo/source/blender/blenkernel/intern/key.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mask.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mask_rasterize.c
branches/cloth-eltopo/source/blender/blenkernel/intern/material.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mball.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/nla.c
branches/cloth-eltopo/source/blender/blenkernel/intern/node.c
branches/cloth-eltopo/source/blender/blenkernel/intern/object.c
branches/cloth-eltopo/source/blender/blenkernel/intern/packedFile.c
branches/cloth-eltopo/source/blender/blenkernel/intern/scene.c
branches/cloth-eltopo/source/blender/blenkernel/intern/seqcache.c
branches/cloth-eltopo/source/blender/blenkernel/intern/seqeffects.c
branches/cloth-eltopo/source/blender/blenkernel/intern/sequencer.c
branches/cloth-eltopo/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cloth-eltopo/source/blender/blenkernel/intern/texture.c
branches/cloth-eltopo/source/blender/blenkernel/intern/world.c
branches/cloth-eltopo/source/blender/blenlib/BLI_listbase.h
branches/cloth-eltopo/source/blender/blenlib/BLI_math_base.h
branches/cloth-eltopo/source/blender/blenlib/BLI_math_rotation.h
branches/cloth-eltopo/source/blender/blenlib/BLI_rect.h
branches/cloth-eltopo/source/blender/blenlib/BLI_utildefines.h
branches/cloth-eltopo/source/blender/blenlib/BLI_vfontdata.h
branches/cloth-eltopo/source/blender/blenlib/intern/freetypefont.c
branches/cloth-eltopo/source/blender/blenlib/intern/listbase.c
branches/cloth-eltopo/source/blender/blenlib/intern/math_rotation.c
branches/cloth-eltopo/source/blender/blenlib/intern/rct.c
branches/cloth-eltopo/source/blender/blenlib/intern/voronoi.c
branches/cloth-eltopo/source/blender/blenloader/intern/readfile.c
branches/cloth-eltopo/source/blender/blenloader/intern/versioning_250.c
branches/cloth-eltopo/source/blender/blenloader/intern/writefile.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_core.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_error.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_interp.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_interp.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_marking.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mods.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_opdefines.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_operator_api.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_polygon.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_queries.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_connect.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_create.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_extrude.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_utils.c
branches/cloth-eltopo/source/blender/collada/EffectExporter.cpp
branches/cloth-eltopo/source/blender/collada/GeometryExporter.cpp
branches/cloth-eltopo/source/blender/collada/ImageExporter.cpp
branches/cloth-eltopo/source/blender/collada/InstanceWriter.cpp
branches/cloth-eltopo/source/blender/compositor/CMakeLists.txt
branches/cloth-eltopo/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_ChunkOrder.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_Converter.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_SocketReader.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/cloth-eltopo/source/blender/editors/animation/anim_channels_defines.c
branches/cloth-eltopo/source/blender/editors/animation/anim_deps.c
branches/cloth-eltopo/source/blender/editors/animation/anim_filter.c
branches/cloth-eltopo/source/blender/editors/animation/anim_markers.c
branches/cloth-eltopo/source/blender/editors/animation/fmodifier_ui.c
branches/cloth-eltopo/source/blender/editors/animation/keyframes_edit.c
branches/cloth-eltopo/source/blender/editors/armature/editarmature.c
branches/cloth-eltopo/source/blender/editors/curve/editcurve.c
branches/cloth-eltopo/source/blender/editors/gpencil/gpencil_edit.c
branches/cloth-eltopo/source/blender/editors/gpencil/gpencil_paint.c
branches/cloth-eltopo/source/blender/editors/include/ED_clip.h
branches/cloth-eltopo/source/blender/editors/include/ED_image.h
branches/cloth-eltopo/source/blender/editors/include/ED_node.h
branches/cloth-eltopo/source/blender/editors/include/UI_interface.h
branches/cloth-eltopo/source/blender/editors/include/UI_view2d.h
branches/cloth-eltopo/source/blender/editors/interface/interface.c
branches/cloth-eltopo/source/blender/editors/interface/interface_draw.c
branches/cloth-eltopo/source/blender/editors/interface/interface_handlers.c
branches/cloth-eltopo/source/blender/editors/interface/interface_icons.c
branches/cloth-eltopo/source/blender/editors/interface/interface_intern.h
branches/cloth-eltopo/source/blender/editors/interface/interface_layout.c
branches/cloth-eltopo/source/blender/editors/interface/interface_ops.c
branches/cloth-eltopo/source/blender/editors/interface/interface_panel.c
branches/cloth-eltopo/source/blender/editors/interface/interface_regions.c
branches/cloth-eltopo/source/blender/editors/interface/interface_style.c
branches/cloth-eltopo/source/blender/editors/interface/interface_templates.c
branches/cloth-eltopo/source/blender/editors/interface/interface_widgets.c
branches/cloth-eltopo/source/blender/editors/interface/resources.c
branches/cloth-eltopo/source/blender/editors/interface/view2d.c
branches/cloth-eltopo/source/blender/editors/interface/view2d_ops.c
branches/cloth-eltopo/source/blender/editors/mask/mask_add.c
branches/cloth-eltopo/source/blender/editors/mask/mask_draw.c
branches/cloth-eltopo/source/blender/editors/mask/mask_select.c
branches/cloth-eltopo/source/blender/editors/mesh/editface.c
branches/cloth-eltopo/source/blender/editors/mesh/editmesh_tools.c
branches/cloth-eltopo/source/blender/editors/object/object_bake.c
branches/cloth-eltopo/source/blender/editors/object/object_edit.c
branches/cloth-eltopo/source/blender/editors/object/object_modifier.c
branches/cloth-eltopo/source/blender/editors/object/object_select.c
branches/cloth-eltopo/source/blender/editors/object/object_transform.c
branches/cloth-eltopo/source/blender/editors/object/object_vgroup.c
branches/cloth-eltopo/source/blender/editors/physics/particle_edit.c
branches/cloth-eltopo/source/blender/editors/physics/physics_fluid.c
branches/cloth-eltopo/source/blender/editors/render/render_internal.c
branches/cloth-eltopo/source/blender/editors/render/render_opengl.c
branches/cloth-eltopo/source/blender/editors/render/render_preview.c
branches/cloth-eltopo/source/blender/editors/screen/area.c
branches/cloth-eltopo/source/blender/editors/screen/glutil.c
branches/cloth-eltopo/source/blender/editors/screen/screen_edit.c
branches/cloth-eltopo/source/blender/editors/screen/screen_ops.c
branches/cloth-eltopo/source/blender/editors/screen/screendump.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_cursor.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_image.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_ops.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/cloth-eltopo/source/blender/editors/space_action/action_draw.c
branches/cloth-eltopo/source/blender/editors/space_action/action_edit.c
branches/cloth-eltopo/source/blender/editors/space_action/action_select.c
branches/cloth-eltopo/source/blender/editors/space_buttons/buttons_header.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_buttons.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_draw.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_editor.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_graph_ops.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_ops.c
branches/cloth-eltopo/source/blender/editors/space_clip/space_clip.c
branches/cloth-eltopo/source/blender/editors/space_clip/tracking_ops.c
branches/cloth-eltopo/source/blender/editors/space_clip/tracking_select.c
branches/cloth-eltopo/source/blender/editors/space_console/space_console.c
branches/cloth-eltopo/source/blender/editors/space_file/file_ops.c
branches/cloth-eltopo/source/blender/editors/space_file/filelist.c
branches/cloth-eltopo/source/blender/editors/space_file/filesel.c
branches/cloth-eltopo/source/blender/editors/space_file/space_file.c
branches/cloth-eltopo/source/blender/editors/space_graph/graph_draw.c
branches/cloth-eltopo/source/blender/editors/space_graph/graph_edit.c
branches/cloth-eltopo/source/blender/editors/space_graph/graph_select.c
branches/cloth-eltopo/source/blender/editors/space_image/image_buttons.c
branches/cloth-eltopo/source/blender/editors/space_image/image_draw.c
branches/cloth-eltopo/source/blender/editors/space_image/image_edit.c
branches/cloth-eltopo/source/blender/editors/space_image/image_ops.c
branches/cloth-eltopo/source/blender/editors/space_image/space_image.c
branches/cloth-eltopo/source/blender/editors/space_logic/logic_buttons.c
branches/cloth-eltopo/source/blender/editors/space_logic/logic_window.c
branches/cloth-eltopo/source/blender/editors/space_logic/space_logic.c
branches/cloth-eltopo/source/blender/editors/space_nla/nla_edit.c
branches/cloth-eltopo/source/blender/editors/space_nla/nla_select.c
branches/cloth-eltopo/source/blender/editors/space_node/drawnode.c
branches/cloth-eltopo/source/blender/editors/space_node/node_add.c
branches/cloth-eltopo/source/blender/editors/space_node/node_draw.c
branches/cloth-eltopo/source/blender/editors/space_node/node_edit.c
branches/cloth-eltopo/source/blender/editors/space_node/node_group.c
branches/cloth-eltopo/source/blender/editors/space_node/node_intern.h
branches/cloth-eltopo/source/blender/editors/space_node/node_ops.c
branches/cloth-eltopo/source/blender/editors/space_node/node_relationships.c
branches/cloth-eltopo/source/blender/editors/space_node/node_select.c
branches/cloth-eltopo/source/blender/editors/space_node/node_templates.c
branches/cloth-eltopo/source/blender/editors/space_node/node_view.c
branches/cloth-eltopo/source/blender/editors/space_outliner/outliner_edit.c
branches/cloth-eltopo/source/blender/editors/space_outliner/space_outliner.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/CMakeLists.txt
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_intern.h
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_ops.c
branches/cloth-eltopo/source/blender/editors/space_text/text_draw.c
branches/cloth-eltopo/source/blender/editors/space_text/text_ops.c
branches/cloth-eltopo/source/blender/editors/space_time/time_ops.c
branches/cloth-eltopo/source/blender/editors/space_view3d/drawobject.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_draw.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_edit.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_intern.h
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_ops.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_select.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_view.c
branches/cloth-eltopo/source/blender/editors/transform/transform.c
branches/cloth-eltopo/source/blender/editors/transform/transform_conversions.c
branches/cloth-eltopo/source/blender/editors/transform/transform_generics.c
branches/cloth-eltopo/source/blender/editors/transform/transform_manipulator.c
branches/cloth-eltopo/source/blender/editors/transform/transform_orientations.c
branches/cloth-eltopo/source/blender/editors/transform/transform_snap.c
branches/cloth-eltopo/source/blender/editors/util/undo.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_ops.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/cloth-eltopo/source/blender/gpu/intern/gpu_draw.c
branches/cloth-eltopo/source/blender/gpu/intern/gpu_material.c
branches/cloth-eltopo/source/blender/ikplugin/CMakeLists.txt
branches/cloth-eltopo/source/blender/ikplugin/SConscript
branches/cloth-eltopo/source/blender/ikplugin/intern/ikplugin_api.c
branches/cloth-eltopo/source/blender/imbuf/IMB_imbuf_types.h
branches/cloth-eltopo/source/blender/imbuf/IMB_moviecache.h
branches/cloth-eltopo/source/blender/imbuf/IMB_thumbs.h
branches/cloth-eltopo/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/cloth-eltopo/source/blender/imbuf/intern/dds/SConscript
branches/cloth-eltopo/source/blender/imbuf/intern/dds/dds_api.cpp
branches/cloth-eltopo/source/blender/imbuf/intern/indexer.c
branches/cloth-eltopo/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/cloth-eltopo/source/blender/imbuf/intern/openexr/SConscript
branches/cloth-eltopo/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/cloth-eltopo/source/blender/imbuf/intern/scaling.c
branches/cloth-eltopo/source/blender/imbuf/intern/tiff.c
branches/cloth-eltopo/source/blender/makesdna/DNA_color_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_curve_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_mask_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_particle_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_sequence_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_userdef_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_vfont_types.h
branches/cloth-eltopo/source/blender/makesrna/RNA_enum_types.h
branches/cloth-eltopo/source/blender/makesrna/intern/makesrna.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_color.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_mask.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_mesh.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree_types.h
branches/cloth-eltopo/source/blender/makesrna/intern/rna_object.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_particle.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_scene.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_sequencer.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_space.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_ui_api.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_userdef.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_boolean.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_cast.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_displace.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_fluidsim.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_lattice.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_meshdeform.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_particlesystem.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_warp.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/cloth-eltopo/source/blender/nodes/CMakeLists.txt
branches/cloth-eltopo/source/blender/nodes/NOD_composite.h
branches/cloth-eltopo/source/blender/nodes/SConscript
branches/cloth-eltopo/source/blender/nodes/composite/node_composite_tree.c
branches/cloth-eltopo/source/blender/nodes/composite/node_composite_util.c
branches/cloth-eltopo/source/blender/nodes/composite/node_composite_util.h
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_common.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_image.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_math.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_value.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/cloth-eltopo/source/blender/nodes/intern/node_common.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_material.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_image.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_output.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types.c
branches/cloth-eltopo/source/blender/python/intern/bpy.c
branches/cloth-eltopo/source/blender/python/intern/bpy_operator.c
branches/cloth-eltopo/source/blender/python/intern/bpy_rna.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Euler.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Euler.h
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Matrix.c
branches/cloth-eltopo/source/blender/render/intern/source/convertblender.c
branches/cloth-eltopo/source/blender/render/intern/source/imagetexture.c
branches/cloth-eltopo/source/blender/render/intern/source/initrender.c
branches/cloth-eltopo/source/blender/render/intern/source/pipeline.c
branches/cloth-eltopo/source/blender/render/intern/source/pointdensity.c
branches/cloth-eltopo/source/blender/render/intern/source/render_result.c
branches/cloth-eltopo/source/blender/render/intern/source/render_texture.c
branches/cloth-eltopo/source/blender/render/intern/source/rendercore.c
branches/cloth-eltopo/source/blender/render/intern/source/shadbuf.c
branches/cloth-eltopo/source/blender/render/intern/source/shadeoutput.c
branches/cloth-eltopo/source/blender/windowmanager/WM_api.h
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_event_system.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_files.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_gesture.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_init_exit.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_jobs.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_operators.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_playanim.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_subwindow.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_window.c
branches/cloth-eltopo/source/blender/windowmanager/wm_event_types.h
branches/cloth-eltopo/source/blenderplayer/CMakeLists.txt
branches/cloth-eltopo/source/creator/CMakeLists.txt
branches/cloth-eltopo/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/BL_Texture.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/KX_GameObject.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/cloth-eltopo/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/cloth-eltopo/source/gameengine/VideoTexture/ImageBuff.cpp
branches/cloth-eltopo/source/gameengine/VideoTexture/ImageBuff.h
Added Paths:
-----------
branches/cloth-eltopo/source/blender/blenkernel/intern/seqmodifier.c
branches/cloth-eltopo/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_DespeckleNode.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DespeckleOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_view.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_despeckle.c
Removed Paths:
-------------
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_DistanceMatteOperation.h
Property Changed:
----------------
branches/cloth-eltopo/source/blender/editors/interface/interface.c
branches/cloth-eltopo/source/blender/editors/space_outliner/
Modified: branches/cloth-eltopo/CMakeLists.txt
===================================================================
--- branches/cloth-eltopo/CMakeLists.txt 2012-08-25 20:49:51 UTC (rev
50209)
+++ branches/cloth-eltopo/CMakeLists.txt 2012-08-25 22:43:41 UTC (rev
50210)
@@ -126,11 +126,13 @@
option(WITH_PYTHON_MODULE "Enable building as a python module which runs
without a user interface, like running regular blender in background mode
(experimental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for
development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for
development & for incompatible C++ compilers)" ON)
-option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio
effects)" OFF)
+option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for
development)" ON)
+option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio
effects)" ON)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
@@ -151,7 +153,7 @@
if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
else()
- set(PLATFORM_DEFAULT OFF)
+ set(PLATFORM_DEFAULT ON)
endif()
option(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" ${PLATFORM_DEFAULT})
unset(PLATFORM_DEFAULT)
@@ -190,7 +192,7 @@
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" ON)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
-option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
+option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" ON)
# Image format support
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support
(http://www.openexr.com)" ON)
@@ -246,7 +248,8 @@
option(WITH_CYCLES "Enable cycles Render
Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test
application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support"
OFF)
-option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
+option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" ON)
+set(CUDA_TOOLKIT_ROOT_DIR "D:/Program Files/NVIDIA GPU Computing
Toolkit/CUDA/v4.2")
set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA
architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -1041,6 +1044,8 @@
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
+ #Turn off OpenMP since it causes crashes on render for
subsurfed/multiresolution meshes
+ set(WITH_OPENMP OFF)
endif()
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-D_LARGEFILE64_SOURCE)
@@ -1795,6 +1800,7 @@
info_cfg_option(WITH_GAMEENGINE)
info_cfg_option(WITH_PLAYER)
info_cfg_option(WITH_BULLET)
+ info_cfg_option(WITH_IK_SOLVER)
info_cfg_option(WITH_IK_ITASC)
info_cfg_option(WITH_OPENCOLLADA)
info_cfg_option(WITH_FFTW3)
Modified: branches/cloth-eltopo/GNUmakefile
===================================================================
--- branches/cloth-eltopo/GNUmakefile 2012-08-25 20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/GNUmakefile 2012-08-25 22:43:41 UTC (rev 50210)
@@ -19,9 +19,9 @@
#
# ##### END GPL LICENSE BLOCK #####
-# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
# eg:
-# ../build/Linux_i386
+# ../build_linux_i386
# This is for users who like to configure & build blender with a single
command.
@@ -40,7 +40,7 @@
endif
ifndef BUILD_DIR
- BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+ BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
endif
Modified: branches/cloth-eltopo/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/cloth-eltopo/build_files/cmake/config/blender_lite.cmake
2012-08-25 20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/build_files/cmake/config/blender_lite.cmake
2012-08-25 22:43:41 UTC (rev 50210)
@@ -18,6 +18,7 @@
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
+set(WITH_IK_SOLVER OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
Modified: branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
2012-08-25 20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
2012-08-25 22:43:41 UTC (rev 50210)
@@ -170,7 +170,7 @@
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
#May produce errors with unsupported MinGW-w64 builds
-WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
##
CC = 'gcc'
Modified: branches/cloth-eltopo/build_files/scons/tools/Blender.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/tools/Blender.py 2012-08-25
20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/build_files/scons/tools/Blender.py 2012-08-25
22:43:41 UTC (rev 50210)
@@ -845,6 +845,8 @@
print bc.HEADER+'Configuring program
'+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
lenv = self.Clone()
lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+ if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross',
'cygwin', 'linux'):
+ lenv.Replace(LINK = '$CXX')
if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
if lenv['BF_DEBUG']:
lenv.Prepend(LINKFLAGS =
['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
Modified: branches/cloth-eltopo/build_files/scons/tools/btools.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/tools/btools.py 2012-08-25
20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/build_files/scons/tools/btools.py 2012-08-25
22:43:41 UTC (rev 50210)
@@ -108,7 +108,7 @@
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
'WITH_BF_FRAMESERVER',
- 'WITH_BF_COMPOSITOR',
+ 'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB',
'BF_JPEG_LIBPATH',
'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC',
'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC',
'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -583,7 +583,8 @@
('BF_BOOST_LIBPATH', 'Boost library path', ''),
('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
- (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on
Linux platforms using XDND protocol', True))
+ (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on
Linux platforms using XDND protocol', True)),
+ (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy
compositor', True))
) # end of opts.AddOptions()
return localopts
Modified: branches/cloth-eltopo/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/cloth-eltopo/doc/python_api/rst/info_best_practice.rst
2012-08-25 20:49:51 UTC (rev 50209)
+++ branches/cloth-eltopo/doc/python_api/rst/info_best_practice.rst
2012-08-25 22:43:41 UTC (rev 50210)
@@ -75,7 +75,7 @@
* layout.row()
- Use row(), when you want more than 1 propertey in one line.
+ Use row(), when you want more than 1 property in one line.
.. code-block:: python
@@ -145,7 +145,7 @@
Modifying Lists
^^^^^^^^^^^^^^^
-In python we can add and remove from a list, This is slower when the list
length is modified, especially at the start of the list, since all the data
after the index of modification needs to be moved up or down 1 place.
+In python we can add and remove from a list, this is slower when the list
length is modified, especially at the start of the list, since all the data
after the index of modification needs to be moved up or down 1 place.
The most simple way to add onto the end of the list is to use
``my_list.append(list_item)`` or ``my_list.extend(some_list)`` and the fastest
way to remove an item is ``my_list.pop()`` or ``del my_list[-1]``.
@@ -154,13 +154,13 @@
Sometimes its faster (but more memory hungry) to just rebuild the list.
-Say you want to remove all triangle faces in a list.
+Say you want to remove all triangular faces in a list.
Rather than...
.. code-block:: python
- faces = mesh.faces[:] # make a list copy of the meshes faces
+ faces = mesh.tessfaces[:] # make a list copy of the meshes faces
f_idx = len(faces) # Loop backwards
while f_idx: # while the value is not 0
f_idx -= 1
@@ -173,13 +173,13 @@
.. code-block:: python
- faces = [f for f in mesh.faces if len(f.vertices) != 3]
+ faces = [f for f in mesh.tessfaces if len(f.vertices) != 3]
Adding List Items
^^^^^^^^^^^^^^^^^
-If you have a list that you want to add onto another list, rather then...
+If you have a list that you want to add onto another list, rather than...
.. code-block:: python
@@ -205,6 +205,14 @@
reverse_list.insert(0, list_item)
+Python provides more convenient ways to reverse a list using the slice method,
but you may want to time this before relying on it too much:
+
+
+.. code-block:: python
+
+ some_reversed_list = some_list[::-1]
+
+
Removing List Items
^^^^^^^^^^^^^^^^^^^
@@ -224,7 +232,7 @@
my_list.pop(list_index)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
