[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42063] branches/soc-2011-tomato: Merging r41937 through r42061 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Nov 22 15:04:36 CET 2011
Revision: 42063
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42063
Author: nazgul
Date: 2011-11-22 14:04:34 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Merging r41937 through r42061 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41937
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42061
Modified Paths:
--------------
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-tomato/build_files/cmake/project_info.py
branches/soc-2011-tomato/build_files/cmake/project_source_info.py
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd7-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd8-config.py
branches/soc-2011-tomato/build_files/scons/config/freebsd9-config.py
branches/soc-2011-tomato/build_files/scons/config/linux-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/manpage/blender.1.py
branches/soc-2011-tomato/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake
branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/bsdf_oren_nayar.h
branches/soc-2011-tomato/intern/cycles/render/filter.cpp
branches/soc-2011-tomato/intern/cycles/util/util_math.h
branches/soc-2011-tomato/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py
branches/soc-2011-tomato/release/scripts/presets/tracking_camera/Sony_A55.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_ocean.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeavi.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2011-tomato/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/loopcut.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_panels.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2011-tomato/source/blender/imbuf/intern/iris.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_property.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/nodes/NOD_composite.h
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/NOD_texture.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.h
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.h
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/generic/noise_py_api.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-tomato/source/tests/pep8.py
Removed Paths:
-------------
branches/soc-2011-tomato/doc/python_api/epy/testbgl.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/release/scripts/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41936
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42061
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2011-11-22 14:04:33 UTC (rev 42062)
+++ branches/soc-2011-tomato/SConstruct 2011-11-22 14:04:34 UTC (rev 42063)
@@ -70,6 +70,7 @@
B = Blender
VERSION = btools.VERSION # This is used in creating the local config directories
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
### globals ###
platform = sys.platform
@@ -524,6 +525,10 @@
if '__pycache__' in dn: # py3.2 cache dir
dn.remove('__pycache__')
+ # only for testing builds
+ if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn:
+ dn.remove('addons_contrib')
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
Modified: branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.py 2011-11-22 14:04:33 UTC (rev 42062)
+++ branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.py 2011-11-22 14:04:34 UTC (rev 42063)
@@ -22,6 +22,12 @@
# <pep8 compliant>
+import sys
+if not sys.version.startswith("3"):
+ print("\nPython3.x needed, found %s.\nAborting!\n" %
+ sys.version.partition(" ")[0])
+ sys.exit(1)
+
from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR
import os
Modified: branches/soc-2011-tomato/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/project_info.py 2011-11-22 14:04:33 UTC (rev 42062)
+++ branches/soc-2011-tomato/build_files/cmake/project_info.py 2011-11-22 14:04:34 UTC (rev 42063)
@@ -44,7 +44,14 @@
"project_name_get"
)
+
import sys
+if not sys.version.startswith("3"):
+ print("\nPython3.x needed, found %s.\nAborting!\n" %
+ sys.version.partition(" ")[0])
+ sys.exit(1)
+
+
import os
from os.path import join, dirname, normpath, abspath, splitext, exists
@@ -142,10 +149,11 @@
from xml.dom.minidom import parse
tree = parse(join(CMAKE_DIR, ".cproject"))
- '''
- f = open(".cproject_pretty", 'w')
- f.write(tree.toprettyxml(indent=" ", newl=""))
- '''
+
+ # to check on nicer xml
+ # f = open(".cproject_pretty", 'w')
+ # f.write(tree.toprettyxml(indent=" ", newl=""))
+
ELEMENT_NODE = tree.ELEMENT_NODE
cproject, = tree.getElementsByTagName("cproject")
@@ -224,7 +232,9 @@
import subprocess
info = subprocess.Popen(["svn", "info", path],
- stdout=subprocess.PIPE).communicate()[0].decode()
+ stdout=subprocess.PIPE).communicate()[0]
+ # string version, we only want the URL
+ info = info.decode(encoding="utf-8", errors="ignore")
for l in info.split("\n"):
l = l.strip()
Modified: branches/soc-2011-tomato/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/project_source_info.py 2011-11-22 14:04:33 UTC (rev 42062)
+++ branches/soc-2011-tomato/build_files/cmake/project_source_info.py 2011-11-22 14:04:34 UTC (rev 42063)
@@ -25,6 +25,14 @@
"SOURCE_DIR",
)
+
+import sys
+if not sys.version.startswith("3"):
+ print("\nPython3.x needed, found %s.\nAborting!\n" %
+ sys.version.partition(" ")[0])
+ sys.exit(1)
+
+
import os
from os.path import join, dirname, normpath, abspath
@@ -73,7 +81,7 @@
def makefile_log():
import subprocess
import time
- # Check blender is not 2.5x until it supports playback again
+
print("running make with --dry-run ...")
process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE,
@@ -85,7 +93,7 @@
out = process.stdout.read()
process.stdout.close()
print("done!", len(out), "bytes")
- return out.decode("ascii").split("\n")
+ return out.decode("utf-8", errors="ignore").split("\n")
def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-11-22 14:04:33 UTC (rev 42062)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-11-22 14:04:34 UTC (rev 42063)
@@ -18,20 +18,20 @@
cmd = 'uname -p'
-MAC_PROC=commands.getoutput(cmd)
+MAC_PROC=commands.getoutput(cmd)
cmd = 'uname -r'
-cmd_res=commands.getoutput(cmd)
+cmd_res=commands.getoutput(cmd)
if cmd_res[:1]=='7':
- MAC_CUR_VER='10.3'
+ MAC_CUR_VER='10.3'
elif cmd_res[:1]=='8':
- MAC_CUR_VER='10.4'
+ MAC_CUR_VER='10.4'
elif cmd_res[:1]=='9':
- MAC_CUR_VER='10.5'
+ MAC_CUR_VER='10.5'
elif cmd_res[:2]=='10':
- MAC_CUR_VER='10.6'
+ MAC_CUR_VER='10.6'
elif cmd_res[:2]=='11':
- MAC_CUR_VER='10.7'
+ MAC_CUR_VER='10.7'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode
@@ -40,7 +40,7 @@
MACOSX_SDK_CHECK=cmd_sdk
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
- USE_QTKIT=True # Carbon quicktime is not available for 64bit
+ USE_QTKIT=True # Carbon quicktime is not available for 64bit
# Default target OSX settings per architecture
@@ -48,41 +48,41 @@
if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
# all releases are now made for 10.5 !
-# MAC_MIN_VERS = '10.3'
-# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-# LCGDIR = '#../lib/darwin-6.1-powerpc'
-# CC = 'gcc-3.3'
-# CXX = 'g++-3.3'
- MAC_MIN_VERS = '10.4'
- MACOSX_DEPLOYMENT_TARGET = '10.4'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
- LCGDIR = '#../lib/darwin-8.0.0-powerpc'
- CC = 'gcc-4.0'
- CXX = 'g++-4.0'
+# MAC_MIN_VERS = '10.3'
+# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+# LCGDIR = '#../lib/darwin-6.1-powerpc'
+# CC = 'gcc-3.3'
+# CXX = 'g++-3.3'
+ MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.0.0-powerpc'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
- MAC_MIN_VERS = '10.4'
- MACOSX_DEPLOYMENT_TARGET = '10.4'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
- LCGDIR = '#../lib/darwin-8.x.i386'
- CC = 'gcc-4.0'
- CXX = 'g++-4.0'
+ MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.x.i386'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
else :
- if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
- # OSX 10.5/6 with Xcode 3.x
- MAC_MIN_VERS = '10.5'
- MACOSX_DEPLOYMENT_TARGET = '10.5'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
- LCGDIR = '#../lib/darwin-9.x.universal'
- CC = 'gcc-4.2'
- CXX = 'g++-4.2'
- else:
- # OSX 10.6/7 with Xcode 4.x
- MAC_MIN_VERS = '10.6'
- MACOSX_DEPLOYMENT_TARGET = '10.6'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
- LCGDIR = '#../lib/darwin-9.x.universal'
- CC = 'gcc-4.2'
- CXX = 'g++-4.2'
+ if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
+ # OSX 10.5/6 with Xcode 3.x
+ MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+ else:
+ # OSX 10.6/7 with Xcode 4.x
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
LIBDIR = '${LCGDIR}'
@@ -109,32 +109,32 @@
WITH_OSX_STATICPYTHON = True
if WITH_OSX_STATICPYTHON:
- # python 3.2 uses precompiled libraries in bf svn /lib by default
+ # python 3.2 uses precompiled libraries in bf svn /lib by default
- BF_PYTHON = LIBDIR + '/python'
- BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
- # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
- BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
- BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
- # BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+ BF_PYTHON = LIBDIR + '/python'
+ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+ # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+ # BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
else:
- # python 3.2 uses Python-framework additionally installed in /Library/Frameworks
-
- BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
- BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
- BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
- #BF_PYTHON_LIB = ''
- BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
-
+ # python 3.2 uses Python-framework additionally installed in /Library/Frameworks
+
+ BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+ BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
+ BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+ #BF_PYTHON_LIB = ''
+ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
+
WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
# for gcc 3.4 and ulterior
if MAC_PROC == 'powerpc':
- BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+ BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
else :
- BF_OPENAL = LIBDIR + '/openal'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list