[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46139] branches/soc-2011-tomato: Merging r46111 through r46136 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue May 1 11:17:23 CEST 2012
Revision: 46139
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46139
Author: nazgul
Date: 2012-05-01 09:17:22 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Merging r46111 through r46136 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46111
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46136
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
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_camera.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
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_emission.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_passes.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_triangle.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/render/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/render/attribute.cpp
branches/soc-2011-tomato/intern/cycles/render/attribute.h
branches/soc-2011-tomato/intern/cycles/render/buffers.cpp
branches/soc-2011-tomato/intern/cycles/render/camera.cpp
branches/soc-2011-tomato/intern/cycles/render/camera.h
branches/soc-2011-tomato/intern/cycles/render/film.cpp
branches/soc-2011-tomato/intern/cycles/render/film.h
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/intern/cycles/render/integrator.cpp
branches/soc-2011-tomato/intern/cycles/render/integrator.h
branches/soc-2011-tomato/intern/cycles/render/mesh.cpp
branches/soc-2011-tomato/intern/cycles/render/mesh.h
branches/soc-2011-tomato/intern/cycles/render/mesh_displace.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/cycles/render/object.h
branches/soc-2011-tomato/intern/cycles/render/scene.cpp
branches/soc-2011-tomato/intern/cycles/render/scene.h
branches/soc-2011-tomato/intern/cycles/render/shader.cpp
branches/soc-2011-tomato/intern/cycles/render/shader.h
branches/soc-2011-tomato/intern/cycles/render/svm.cpp
branches/soc-2011-tomato/intern/cycles/render/svm.h
branches/soc-2011-tomato/intern/cycles/subd/subd_dice.cpp
branches/soc-2011-tomato/intern/cycles/util/util_math.h
branches/soc-2011-tomato/intern/cycles/util/util_transform.cpp
branches/soc-2011-tomato/intern/cycles/util/util_transform.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/avi/intern/avirgb.c
branches/soc-2011-tomato/source/blender/avi/intern/codecs.c
branches/soc-2011-tomato/source/blender/avi/intern/endian.c
branches/soc-2011-tomato/source/blender/avi/intern/endian.h
branches/soc-2011-tomato/source/blender/avi/intern/mjpeg.c
branches/soc-2011-tomato/source/blender/avi/intern/options.c
branches/soc-2011-tomato/source/blender/avi/intern/rgb32.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/booleanops_mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.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/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_memarena.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h
branches/soc-2011-tomato/source/blender/blenlib/PIL_time.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/cpu.c
branches/soc-2011-tomato/source/blender/blenlib/intern/jitter.c
branches/soc-2011-tomato/source/blender/blenlib/intern/noise.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/blenpluginapi/documentation.h
branches/soc-2011-tomato/source/blender/blenpluginapi/externdef.h
branches/soc-2011-tomato/source/blender/blenpluginapi/floatpatch.h
branches/soc-2011-tomato/source/blender/blenpluginapi/iff.h
branches/soc-2011-tomato/source/blender/blenpluginapi/plugin.h
branches/soc-2011-tomato/source/blender/blenpluginapi/util.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.h
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.h
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.h
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/datafiles/Bfont.c
branches/soc-2011-tomato/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_fluidsim.h
branches/soc-2011-tomato/source/blender/editors/include/ED_particle.h
branches/soc-2011-tomato/source/blender/editors/include/ED_physics.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.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_group.c
branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_time/space_time.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
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_extensions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_allocimbuf.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/cineon/cineonfile.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineonlib.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxfile.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxlib.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageCore.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageLib.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageLib.h
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logmemfile.h
branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imbuf.h
branches/soc-2011-tomato/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_boid_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_group_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_property_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.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_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2011-tomato/source/blender/render/intern/include/gammaCorrectionTables.h
branches/soc-2011-tomato/source/blender/render/intern/include/initrender.h
branches/soc-2011-tomato/source/blender/render/intern/include/occlusion.h
branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
branches/soc-2011-tomato/source/blender/render/intern/include/shadbuf.h
branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_internal.h
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/pixelblending.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-tomato/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/gpu/shaders/
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c
Removed Paths:
-------------
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/gpu/intern/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vertex.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46110
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46136
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-01 09:17:22 UTC (rev 46139)
@@ -304,7 +304,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
@@ -1618,6 +1618,7 @@
if(NOT EXISTS "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy")
message(WARNING "Numpy path '${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy' is missing, "
"WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+ set(WITH_PYTHON_INSTALL_NUMPY OFF)
endif()
endif()
endif()
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-05-01 09:17:22 UTC (rev 46139)
@@ -284,8 +284,7 @@
xml_read_float(&cam->farclip, node, "farclip");
xml_read_float(&cam->aperturesize, node, "aperturesize"); // 0.5*focallength/fstop
xml_read_float(&cam->focaldistance, node, "focaldistance");
- xml_read_float(&cam->shutteropen, node, "shutteropen");
- xml_read_float(&cam->shutterclose, node, "shutterclose");
+ xml_read_float(&cam->shuttertime, node, "shuttertime");
if(xml_equal_string(node, "type", "orthographic"))
cam->type = CAMERA_ORTHOGRAPHIC;
@@ -705,7 +704,7 @@
}
/* temporary for test compatibility */
- mesh->attributes.remove(Attribute::STD_VERTEX_NORMAL);
+ mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL);
}
/* Patch */
@@ -766,7 +765,7 @@
delete patch;
/* temporary for test compatibility */
- mesh->attributes.remove(Attribute::STD_VERTEX_NORMAL);
+ mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL);
}
}
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py 2012-05-01 09:17:22 UTC (rev 46139)
@@ -21,10 +21,9 @@
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "version": (0, 0),
- "blender": (2, 6, 2),
+ "blender": (2, 6, 3),
"location": "Info header, render engine menu",
- "description": "Cycles Render Engine integration.",
+ "description": "Cycles Render Engine integration",
"warning": "",
"wiki_url": "http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles",
"tracker_url": "",
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-05-01 09:17:22 UTC (rev 46139)
@@ -94,6 +94,29 @@
col.prop(cscene, "blur_glossy")
+class CyclesRender_PT_motion_blur(CyclesButtonsPanel, Panel):
+ bl_label = "Motion Blur"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ return False
+
+ def draw_header(self, context):
+ rd = context.scene.render
+
+ self.layout.prop(rd, "use_motion_blur", text="")
+
+ def draw(self, context):
+ layout = self.layout
+
+ rd = context.scene.render
+ layout.active = rd.use_motion_blur
+
+ row = layout.row()
+ row.prop(rd, "motion_blur_shutter")
+
+
class CyclesRender_PT_film(CyclesButtonsPanel, Panel):
bl_label = "Film"
@@ -202,10 +225,10 @@
col.prop(rl, "use_pass_combined")
col.prop(rl, "use_pass_z")
col.prop(rl, "use_pass_normal")
+ col.prop(rl, "use_pass_vector")
+ col.prop(rl, "use_pass_uv")
col.prop(rl, "use_pass_object_index")
col.prop(rl, "use_pass_material_index")
- col.prop(rl, "use_pass_emit")
- col.prop(rl, "use_pass_environment")
col.prop(rl, "use_pass_ambient_occlusion")
col.prop(rl, "use_pass_shadow")
@@ -227,7 +250,10 @@
row.prop(rl, "use_pass_transmission_indirect", text="Indirect", toggle=True)
row.prop(rl, "use_pass_transmission_color", text="Color", toggle=True)
+ col.prop(rl, "use_pass_emit", text="Emission")
+ col.prop(rl, "use_pass_environment")
+
class Cycles_PT_post_processing(CyclesButtonsPanel, Panel):
bl_label = "Post Processing"
bl_options = {'DEFAULT_CLOSED'}
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp 2012-05-01 09:17:22 UTC (rev 46139)
@@ -35,6 +35,7 @@
float ortho_scale;
float lens;
+ float shuttertime;
float aperturesize;
uint apertureblades;
@@ -64,6 +65,7 @@
bcam->sensor_width = 32.0f;
bcam->sensor_height = 18.0f;
bcam->sensor_fit = BlenderCamera::AUTO;
+ bcam->shuttertime = 1.0f;
}
static float blender_camera_focal_distance(BL::Object b_ob, BL::Camera b_camera)
@@ -132,6 +134,28 @@
}
}
+static Transform blender_camera_matrix(const Transform& tfm, CameraType type)
+{
+ Transform result;
+
+ if(type == CAMERA_ENVIRONMENT) {
+ /* make it so environment camera needs to be pointed in the direction
+ of the positive x-axis to match an environment texture, this way
+ it is looking at the center of the texture */
+ result = tfm *
+ make_transform( 0.0f, -1.0f, 0.0f, 0.0f,
+ 0.0f, 0.0f, 1.0f, 0.0f,
+ -1.0f, 0.0f, 0.0f, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f);
+ }
+ else {
+ /* note the blender camera points along the negative z-axis */
+ result = tfm * transform_scale(1.0f, 1.0f, -1.0f);
+ }
+
+ return transform_clear_scale(result);
+}
+
static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int height)
{
/* copy camera to compare later */
@@ -224,25 +248,12 @@
cam->bladesrotation = bcam->aperturerotation;
/* transform */
- cam->matrix = bcam->matrix;
+ cam->matrix = blender_camera_matrix(bcam->matrix, bcam->type);
+ cam->motion.pre = cam->matrix;
+ cam->motion.post = cam->matrix;
+ cam->use_motion = false;
+ cam->shuttertime = bcam->shuttertime;
- if(bcam->type == CAMERA_ENVIRONMENT) {
- /* make it so environment camera needs to be pointed in the direction
- of the positive x-axis to match an environment texture, this way
- it is looking at the center of the texture */
- cam->matrix = cam->matrix *
- make_transform( 0.0f, -1.0f, 0.0f, 0.0f,
- 0.0f, 0.0f, 1.0f, 0.0f,
- -1.0f, 0.0f, 0.0f, 0.0f,
- 0.0f, 0.0f, 0.0f, 1.0f);
- }
- else {
- /* note the blender camera points along the negative z-axis */
- cam->matrix = cam->matrix * transform_scale(1.0f, 1.0f, -1.0f);
- }
-
- cam->matrix = transform_clear_scale(cam->matrix);
-
/* set update flag */
if(cam->modified(prevcam))
cam->tag_update();
@@ -260,6 +271,7 @@
bcam.pixelaspect.x = r.pixel_aspect_x();
bcam.pixelaspect.y = r.pixel_aspect_y();
+ bcam.shuttertime = r.motion_blur_shutter();
/* camera object */
BL::Object b_ob = b_scene.camera();
@@ -277,6 +289,23 @@
blender_camera_sync(cam, &bcam, width, height);
}
+void BlenderSync::sync_camera_motion(BL::Object b_ob, int motion)
+{
+ Camera *cam = scene->camera;
+
+ Transform tfm = get_transform(b_ob.matrix_world());
+ tfm = blender_camera_matrix(tfm, cam->type);
+
+ if(tfm != cam->matrix) {
+ if(motion == -1)
+ cam->motion.pre = tfm;
+ else
+ cam->motion.post = tfm;
+
+ cam->use_motion = true;
+ }
+}
+
/* Sync 3D View Camera */
void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
@@ -288,6 +317,7 @@
bcam.nearclip = b_v3d.clip_start();
bcam.farclip = b_v3d.clip_end();
bcam.lens = b_v3d.lens();
+ bcam.shuttertime = b_scene.render().motion_blur_shutter();
if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_CAMERA) {
/* camera view */
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp 2012-05-01 08:19:11 UTC (rev 46138)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp 2012-05-01 09:17:22 UTC (rev 46139)
@@ -33,30 +33,6 @@
/* Find/Add */
-static bool mesh_need_attribute(Scene *scene, Mesh *mesh, Attribute::Standard std)
-{
- if(std == Attribute::STD_NONE)
- return false;
-
- foreach(uint shader, mesh->used_shaders)
- if(scene->shaders[shader]->attributes.find(std))
- return true;
-
- return false;
-}
-
-static bool mesh_need_attribute(Scene *scene, Mesh *mesh, ustring name)
-{
- if(name == ustring())
- return false;
-
- foreach(uint shader, mesh->used_shaders)
- if(scene->shaders[shader]->attributes.find(name))
- return true;
-
- return false;
-}
-
static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<uint>& used_shaders)
{
/* create vertices */
@@ -66,7 +42,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list