[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58505] branches/soc-2013-sketch_mesh: svn merge ^/trunk/blender 58270:58498
Alexander Pinzon
apinzonf at gmail.com
Mon Jul 22 18:41:37 CEST 2013
Revision: 58505
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58505
Author: apinzonf
Date: 2013-07-22 16:41:36 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
svn merge ^/trunk/blender 58270:58498
Modified Paths:
--------------
branches/soc-2013-sketch_mesh/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2013-sketch_mesh/intern/cycles/app/cycles_test.cpp
branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/presets.py
branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/properties.py
branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/ui.py
branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_object.cpp
branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-sketch_mesh/intern/cycles/device/device_cpu.cpp
branches/soc-2013-sketch_mesh/intern/cycles/kernel/kernel_light.h
branches/soc-2013-sketch_mesh/intern/cycles/render/session.cpp
branches/soc-2013-sketch_mesh/intern/cycles/util/util_task.cpp
branches/soc-2013-sketch_mesh/intern/cycles/util/util_task.h
branches/soc-2013-sketch_mesh/intern/cycles/util/util_view.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_DropTargetX11.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2013-sketch_mesh/intern/opencl/OCL_opencl.h
branches/soc-2013-sketch_mesh/intern/opencl/intern/OCL_opencl.c
branches/soc-2013-sketch_mesh/intern/opencl/intern/clew.c
branches/soc-2013-sketch_mesh/intern/smoke/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/tools/credits_svn_gen.py
branches/soc-2013-sketch_mesh/release/datafiles/LICENSE-droidsans.ttf.txt
branches/soc-2013-sketch_mesh/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2013-sketch_mesh/release/datafiles/splash.png
branches/soc-2013-sketch_mesh/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/node.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-sketch_mesh/source/blender/avi/intern/avi_options.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_key.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_text.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/action.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/armature.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/curve.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/deform.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/editmesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/image.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/implicit.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/ipo.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/key.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/library.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/material.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/node.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/object.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/paint.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/text.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/DLRB_tree.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/fileops.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/math_color.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/noise.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/path_util.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/storage.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/string.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-sketch_mesh/source/blender/blenloader/intern/readfile.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-sketch_mesh/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/MeshImporter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/TransformWriter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/collada_utils.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_filter.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_markers.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/drivers.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/keyframing.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/keyingsets.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_utils.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/pose_slide.c
branches/soc-2013-sketch_mesh/source/blender/editors/curve/editfont.c
branches/soc-2013-sketch_mesh/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2013-sketch_mesh/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_armature.h
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_mesh.h
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/resources.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/view2d.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_add.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/meshtools.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_add.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_hook.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_lattice.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_relations.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_vgroup.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_internal.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_opengl.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_shading.c
branches/soc-2013-sketch_mesh/source/blender/editors/screen/screen_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/space_action/action_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_action/action_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_action/action_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_action/space_action.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_file/filelist.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_image/space_image.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_info/space_info.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/drawnode.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_templates.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/space_node.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_text/space_text.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_time/space_time.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_generics.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-sketch_mesh/source/blender/editors/util/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blender/editors/util/numinput.c
branches/soc-2013-sketch_mesh/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2013-sketch_mesh/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/anim_movie.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/png.c
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_image.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_util.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_util.h
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2013-sketch_mesh/source/blender/nodes/NOD_static_types.h
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_socket.c
branches/soc-2013-sketch_mesh/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2013-sketch_mesh/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2013-sketch_mesh/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2013-sketch_mesh/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-sketch_mesh/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_rna.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-sketch_mesh/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2013-sketch_mesh/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-sketch_mesh/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-sketch_mesh/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-sketch_mesh/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/wm_event_types.h
branches/soc-2013-sketch_mesh/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-sketch_mesh/source/creator/creator.c
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GameLogic/SCA_IScene.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2013-sketch_mesh/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/SConscript
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2013-sketch_mesh/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-sketch_mesh/release/scripts/presets/cycles/sampling/
Removed Paths:
-------------
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_System.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_System.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/bmfont.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/load.blend
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/logo_blender.raw
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/logo_blender3d.raw
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/logo_nan.raw
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/xembed/
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
Property Changed:
----------------
branches/soc-2013-sketch_mesh/
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-sketch_mesh
___________________________________________________________________
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,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57382-58270
+ /branches/ge_dev:58091-58422
/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,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57382-58498
Modified: branches/soc-2013-sketch_mesh/CMakeLists.txt
===================================================================
--- branches/soc-2013-sketch_mesh/CMakeLists.txt 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/CMakeLists.txt 2013-07-22 16:41:36 UTC (rev 58505)
@@ -538,9 +538,6 @@
set(PLATFORM_LINKFLAGS_DEBUG "")
-# disabled for now, not supported
-# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
-
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
@@ -1874,17 +1871,7 @@
set(REDCODE_INC ${REDCODE})
endif()
-#-----------------------------------------------------------------------------
-# Blender WebPlugin
-if(WITH_WEBPLUGIN)
- set(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
- set(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
-
- set(WITH_PLAYER ON)
-endif()
-
-
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
@@ -1977,6 +1964,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) # C only
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -2003,6 +1991,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
Modified: branches/soc-2013-sketch_mesh/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2013-sketch_mesh/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-07-22 16:41:36 UTC (rev 58505)
@@ -347,10 +347,6 @@
uint64_t st_time = m_formatCtx->start_time;
uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
- if (seek_pos < 0) {
- seek_pos = 0;
- }
-
if (st_time != AV_NOPTS_VALUE) {
seek_pos += st_time;
}
Modified: branches/soc-2013-sketch_mesh/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2013-sketch_mesh/intern/cycles/app/cycles_test.cpp 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/cycles/app/cycles_test.cpp 2013-07-22 16:41:36 UTC (rev 58505)
@@ -181,7 +181,7 @@
options.session->reset(session_buffer_params(), options.session_params.samples);
}
-void keyboard(unsigned char key)
+static void keyboard(unsigned char key)
{
if(key == 'r')
options.session->reset(session_buffer_params(), options.session_params.samples);
Modified: branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/presets.py
===================================================================
--- branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/presets.py 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/presets.py 2013-07-22 16:41:36 UTC (rev 58505)
@@ -46,6 +46,36 @@
preset_subdir = "cycles/integrator"
+class AddPresetSampling(AddPresetBase, Operator):
+ '''Add a Sampling Preset'''
+ bl_idname = "render.cycles_sampling_preset_add"
+ bl_label = "Add Sampling Preset"
+ preset_menu = "CYCLES_MT_sampling_presets"
+
+ preset_defines = [
+ "cycles = bpy.context.scene.cycles"
+ ]
+
+ preset_values = [
+ "cycles.samples",
+ "cycles.preview_samples",
+ "cycles.aa_samples",
+ "cycles.preview_aa_samples",
+ "cycles.diffuse_samples",
+ "cycles.glossy_samples",
+ "cycles.transmission_samples",
+ "cycles.ao_samples",
+ "cycles.mesh_light_samples",
+ "cycles.subsurface_samples",
+ "cycles.no_caustics",
+ "cycles.blur_glossy",
+ "cycles.squared_samples",
+ "cycles.progressive"
+ ]
+
+ preset_subdir = "cycles/sampling"
+
+
def register():
pass
Modified: branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/properties.py 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/properties.py 2013-07-22 16:41:36 UTC (rev 58505)
@@ -150,6 +150,11 @@
description="Use progressive sampling of lighting",
default=True,
)
+ cls.squared_samples = BoolProperty(
+ name="Squared Samples",
+ description="Square sampling values for easier artist control",
+ default=False,
+ )
cls.samples = IntProperty(
name="Samples",
Modified: branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/ui.py 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/ui.py 2013-07-22 16:41:36 UTC (rev 58505)
@@ -23,6 +23,14 @@
from bpy.types import Panel, Menu, Operator
+class CYCLES_MT_sampling_presets(Menu):
+ bl_label = "Sampling Presets"
+ preset_subdir = "cycles/sampling"
+ preset_operator = "script.execute_preset"
+ COMPAT_ENGINES = {'CYCLES'}
+ draw = Menu.draw_preset
+
+
class CYCLES_MT_integrator_presets(Menu):
bl_label = "Integrator Presets"
preset_subdir = "cycles/integrator"
@@ -52,22 +60,30 @@
scene = context.scene
cscene = scene.cycles
device_type = context.user_preferences.system.compute_device_type
+
+ row = layout.row(align=True)
+ row.menu("CYCLES_MT_sampling_presets", text=bpy.types.CYCLES_MT_sampling_presets.bl_label)
+ row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMIN")
+ row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
+ row = layout.row()
+ sub = row.row()
+ sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
+ sub.prop(cscene, "progressive")
+ row.prop(cscene, "squared_samples")
+
split = layout.split()
-
+
col = split.column()
- sub = col.column()
- sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
- sub.prop(cscene, "progressive")
-
sub = col.column(align=True)
+ sub.label("Settings:")
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
if cscene.progressive or (device_type != 'NONE' and cscene.device == 'GPU'):
col = split.column()
- col.label(text="Samples:")
sub = col.column(align=True)
+ sub.label(text="Samples:")
sub.prop(cscene, "samples", text="Render")
sub.prop(cscene, "preview_samples", text="Preview")
else:
@@ -76,8 +92,8 @@
sub.prop(cscene, "preview_aa_samples", text="Preview")
col = split.column()
- col.label(text="Samples:")
sub = col.column(align=True)
+ sub.label(text="Samples:")
sub.prop(cscene, "diffuse_samples", text="Diffuse")
sub.prop(cscene, "glossy_samples", text="Glossy")
sub.prop(cscene, "transmission_samples", text="Transmission")
Modified: branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_object.cpp 2013-07-22 15:35:29 UTC (rev 58504)
+++ branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_object.cpp 2013-07-22 16:41:36 UTC (rev 58505)
@@ -154,10 +154,16 @@
light->shader = used_shaders[0];
/* shadow */
+ PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list