[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50304] branches/soc-2012-bratwurst: merge with trunk r50303
Antony Riakiotakis
kalast at gmail.com
Sat Sep 1 00:23:32 CEST 2012
Revision: 50304
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50304
Author: psy-fi
Date: 2012-08-31 22:23:28 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
merge with trunk r50303
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50303
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-bratwurst/build_files/scons/tools/Blender.py
branches/soc-2012-bratwurst/doc/python_api/rst/info_gotcha.rst
branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.h
branches/soc-2012-bratwurst/intern/cycles/blender/blender_util.h
branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp
branches/soc-2012-bratwurst/intern/cycles/cmake/external_libs.cmake
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_object.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_types.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_math.h
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_types.h
branches/soc-2012-bratwurst/intern/cycles/render/CMakeLists.txt
branches/soc-2012-bratwurst/intern/cycles/render/nodes.cpp
branches/soc-2012-bratwurst/intern/cycles/render/nodes.h
branches/soc-2012-bratwurst/intern/cycles/render/object.cpp
branches/soc-2012-bratwurst/intern/cycles/render/object.h
branches/soc-2012-bratwurst/intern/cycles/render/scene.cpp
branches/soc-2012-bratwurst/intern/cycles/render/scene.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2012-bratwurst/intern/opennl/intern/opennl.c
branches/soc-2012-bratwurst/release/scripts/modules/addon_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/blend_render_info.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy/utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/rna_xml.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-bratwurst/release/scripts/templates/addon_add_object.py
branches/soc-2012-bratwurst/release/scripts/templates/operator_mesh_add.py
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-bratwurst/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_context.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_image.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_material.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_screen.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_world.h
branches/soc-2012-bratwurst/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/curve.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/library.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/material.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mball.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/nla.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sound.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/world.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_base.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_vector.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_path_util.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_pbvh.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_rect.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_string.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/bpath.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_vector.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/path_util.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/rct.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/string.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_error.h
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_interp.h
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mods.h
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h
branches/soc-2012-bratwurst/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/TransformReader.h
branches/soc-2012-bratwurst/source/blender/collada/collada_internal.h
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TransformNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-bratwurst/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_edit.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_mesh.h
branches/soc-2012-bratwurst/source/blender/editors/include/UI_view2d.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_draw.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_intern.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_layout.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_ops.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_panel.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_add.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_vgroup.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_preview.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/screen/glutil.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screendump.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/space_file.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/space_image.c
branches/soc-2012-bratwurst/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-bratwurst/source/blender/editors/space_logic/space_logic.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_add.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_group.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_view.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/soc-2012-bratwurst/source/blender/editors/space_text/text_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.h
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_snap.c
branches/soc-2012-bratwurst/source/blender/editors/util/ed_util.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-bratwurst/source/blender/gpu/GPU_draw.h
branches/soc-2012-bratwurst/source/blender/gpu/GPU_extensions.h
branches/soc-2012-bratwurst/source/blender/gpu/GPU_material.h
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-bratwurst/source/blender/ikplugin/SConscript
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_thumbs.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/bmp.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/imbuf/intern/dds/SConscript
branches/soc-2012-bratwurst/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/SConscript
branches/soc-2012-bratwurst/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/scaling.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/tiff.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/util.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_particle_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_armature.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_image.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_particle.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_pose.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2012-bratwurst/source/blender/nodes/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/nodes/NOD_composite.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_common.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_util.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_util.h
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types_select.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2012-bratwurst/source/blender/python/generic/py_capi_utils.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_operator.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2012-bratwurst/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2012-bratwurst/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2012-bratwurst/source/blender/render/intern/include/rayobject.h
branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/initrender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/pipeline.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/rendercore.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-bratwurst/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-bratwurst/source/creator/creator.c
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2012-bratwurst/source/gameengine/Expressions/BoolValue.cpp
branches/soc-2012-bratwurst/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageBuff.h
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/intern/cycles/render/particles.cpp
branches/soc-2012-bratwurst/intern/cycles/render/particles.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask_evaluate.c
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DespeckleNode.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DespeckleOperation.h
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_despeckle.c
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-50095
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-50303
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-31 22:23:28 UTC (rev 50304)
@@ -1050,6 +1050,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)
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-08-31 22:23:28 UTC (rev 50304)
@@ -174,7 +174,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/soc-2012-bratwurst/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/tools/Blender.py 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/build_files/scons/tools/Blender.py 2012-08-31 22:23:28 UTC (rev 50304)
@@ -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/soc-2012-bratwurst/doc/python_api/rst/info_gotcha.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/info_gotcha.rst 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/info_gotcha.rst 2012-08-31 22:23:28 UTC (rev 50304)
@@ -137,11 +137,11 @@
NGons and Tessellation Faces
============================
-Since 2.63 NGons are supported, this adds some complexity since in some cases you need to access triangles still (some exporters for example).
+Since 2.63 NGons are supported, this adds some complexity since in some cases you need to access triangles/quads still (some exporters for example).
There are now 3 ways to access faces:
-* :class:`bpy.types.MeshPolygon` - this is the data stricture which now stores faces in object mode (access as ``mesh.polygons`` rather then ``mesh.faces``).
+* :class:`bpy.types.MeshPolygon` - this is the data structure which now stores faces in object mode (access as ``mesh.polygons`` rather then ``mesh.faces``).
* :class:`bpy.types.MeshTessFace` - the result of triangulating (tessellated) polygons, the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
* :class:`bmesh.types.BMFace` - the polygons as used in editmode.
Modified: branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Source/RecastFilter.cpp
===================================================================
--- branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Source/RecastFilter.cpp 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/extern/recastnavigation/Recast/Source/RecastFilter.cpp 2012-08-31 22:23:28 UTC (rev 50304)
@@ -128,7 +128,7 @@
rcSpan* ns = solid.spans[dx + dy*w];
int nbot = -walkableClimb;
int ntop = ns ? (int)ns->smin : MAX_HEIGHT;
- // Skip neightbour if the gap between the spans is too small.
+ // Skip neighbor if the gap between the spans is too small.
if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
minh = rcMin(minh, nbot - bot);
@@ -137,7 +137,7 @@
{
nbot = (int)ns->smax;
ntop = ns->next ? (int)ns->next->smin : MAX_HEIGHT;
- // Skip neightbour if the gap between the spans is too small.
+ // Skip neighbor if the gap between the spans is too small.
if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
{
minh = rcMin(minh, nbot - bot);
Modified: branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp 2012-08-31 22:23:28 UTC (rev 50304)
@@ -484,6 +484,7 @@
else if(string_iequals(node.name(), "mix")) {
MixNode *mix = new MixNode();
xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
+ xml_read_bool(&mix->use_clamp, node, "use_clamp");
snode = mix;
}
else if(string_iequals(node.name(), "gamma")) {
@@ -515,6 +516,7 @@
else if(string_iequals(node.name(), "math")) {
MathNode *math = new MathNode();
xml_read_enum(&math->type, MathNode::type_enum, node, "type");
+ xml_read_bool(&math->use_clamp, node, "use_clamp");
snode = math;
}
else if(string_iequals(node.name(), "vector_math")) {
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2012-08-31 22:23:28 UTC (rev 50304)
@@ -247,11 +247,8 @@
scene->object_manager->tag_update(scene);
}
- /* updated dupli objects require particle sync */
- bool need_particle_update = object_need_particle_update(b_ob);
-
/* object sync */
- if(object_updated || (object->mesh && object->mesh->need_update) || need_particle_update) {
+ if(object_updated || (object->mesh && object->mesh->need_update)) {
object->name = b_ob.name().c_str();
object->pass_id = b_ob.pass_index();
object->tfm = tfm;
@@ -277,10 +274,6 @@
object->particle_id = particle_id;
- /* particle sync */
- if (need_particle_update)
- sync_particles(object, b_ob);
-
object->tag_update(scene);
}
}
@@ -303,7 +296,7 @@
/* object loop */
BL::Scene::objects_iterator b_ob;
BL::Scene b_sce = b_scene;
- int particle_offset = 0;
+ int particle_offset = 1; /* first particle is dummy for regular, non-instanced objects */
for(; b_sce; b_sce = b_sce.background_set()) {
for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp 2012-08-31 20:31:21 UTC (rev 50303)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/blender_particles.cpp 2012-08-31 22:23:28 UTC (rev 50304)
@@ -16,9 +16,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "object.h"
+#include "mesh.h"
+#include "particles.h"
-#include "mesh.h"
#include "blender_sync.h"
#include "blender_util.h"
@@ -31,7 +31,7 @@
/* Particles Sync */
-bool BlenderSync::object_need_particle_update(BL::Object b_ob)
+bool BlenderSync::psys_need_update(BL::ParticleSystem b_psys)
{
/* Particle data is only needed for
* a) Billboard render mode if object's own material uses particle info
@@ -41,9 +41,7 @@
*/
bool need_update = false;
- BL::Object::particle_systems_iterator b_psys;
- for (b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
- switch (b_psys->settings().render_type()) {
+ switch (b_psys.settings().render_type()) {
/* XXX not implemented yet!
* billboards/strands would become part of the mesh data (?),
* so the mesh attributes would store whether particle info is required.
@@ -61,7 +59,7 @@
#endif
case BL::ParticleSettings::render_type_OBJECT: {
- BL::Object b_dupli_ob = b_psys->settings().dupli_object();
+ BL::Object b_dupli_ob = b_psys.settings().dupli_object();
if (b_dupli_ob) {
BL::ID key = (BKE_object_is_modified(b_dupli_ob))? b_dupli_ob: b_dupli_ob.data();
Mesh *mesh = mesh_map.find(key);
@@ -73,7 +71,7 @@
}
case BL::ParticleSettings::render_type_GROUP: {
- BL::Group b_dupli_group = b_psys->settings().dupli_group();
+ BL::Group b_dupli_group = b_psys.settings().dupli_group();
if (b_dupli_group) {
BL::Group::objects_iterator b_gob;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list