Blender Git Loki

Git Commits -> Revision 9bdec67

Revision 9bdec67 by Sergey Sharybin
May 8, 2012, 22:20 (GMT)
blender 2.63a: merge changes from trunk into tag

For details see
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29

Merged listed revisions until 46419, currently not merged revisions from
Collada and Aligorith sections.

Revisions which caused difficulties with merge and which need to be verified:
* 46159: seems to be a fix for post-release merge tomato into trunk 46023
with bunch of optimizations, changes are currently ignored
* 46179: some of changes in camera.cpp and object.cpp are related on 46114 which
added support for motion vector and UV passes, later Brecht cleaned up
all changes related holdout due to the got mixed with motion blur.
* 46181: changes in rna_lamp touches code from rev46134 (merge Harmony branch)
and can not be applied on pre-merge state
* 46222: none changes applied - all of them is for code introduced in 46175
which isn't getting backported to tag
* 46341: completely skip -- related to changes from 46279 which is not getting backported
* 46277: changes to mesh.c (which the only actual interesting changes here) are ignored.
Comment says "improvement to LAST commit" and this LAST commit is not
getting merged. Hopefully merge conflicts were resolved in a way which
keeps file in a state previous to 46276.
* Commits related on solidify modifier. They got totally screwed up MOD_solidify.c
due to all that style cleanup and so. Finished up backporting MOD_solidify.c from
trunk into tag by reverting style commits (seems all actual changes need to be
backported there). Hopefully it's fine now.
* 46417: some Changes in smoke.c are related on changes made in merge commit from
smoke2 branch into trunk. Hopefully the same changes works fine with
pre-merged smoke.

Commit Details:

Full Hash: 9bdec67947f2134b5a04eccec8c545ba1aff7d6b
SVN Revision: 46440
Parent Commit: 6e2cff8
Lines Changed: +1925, -838

1 Added Path:

/release/scripts/presets/tracking_settings/blurry_movie.py (+11, -0) (View)

142 Modified Paths:

/intern/audaspace/intern/AUD_C-API.cpp (+42, -0) (Diff)
/intern/audaspace/intern/AUD_C-API.h (+15, -0) (Diff)
/intern/audaspace/intern/AUD_FileWriter.cpp (+36, -0) (Diff)
/intern/audaspace/intern/AUD_FileWriter.h (+10, -0) (Diff)
/intern/audaspace/intern/AUD_Reference.h (+28, -0) (Diff)
/intern/audaspace/intern/AUD_ReferenceHandler.cpp (+21, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+1, -1) (Diff)
/intern/cycles/blender/blender_sync.cpp (+2, -0) (Diff)
/intern/cycles/blender/blender_sync.h (+3, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+25, -7) (Diff)
/intern/cycles/util/util_math.h (+5, -0) (Diff)
/intern/cycles/util/util_transform.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_NDOFManagerX11.cpp (+2, -1) (Diff)
/intern/guardedalloc/cpp/mallocn.cpp (+3, -1) (Diff)
/release/scripts/startup/bl_operators/image.py (+17, -9) (Diff)
/release/scripts/startup/bl_operators/uvcalc_lightmap.py (+11, -12) (Diff)
/release/scripts/startup/bl_ui/properties_animviz.py (+38, -8) (Diff)
/release/scripts/startup/bl_ui/properties_data_armature.py (+6, -8) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+4, -8) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+0, -4) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+5, -4) (Diff)
/release/scripts/templates/operator_modal_timer.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_constraint.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_customdata.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+20, -7) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/armature.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+45, -33) (Diff)
/source/blender/blenkernel/intern/customdata.c (+15, -1) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/fluidsim.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/mesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/multires.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+20, -6) (Diff)
/source/blender/blenkernel/intern/smoke.c (+0, -23) (Diff)
/source/blender/blenkernel/intern/softbody.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/text.c (+21, -45) (Diff)
/source/blender/blenkernel/intern/tracking.c (+2, -0) (Diff)
/source/blender/blenlib/BLI_fileops.h (+1, -0) (Diff)
/source/blender/blenlib/BLI_ghash.h (+2, -2) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+2, -0) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+3, -3) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+29, -0) (Diff)
/source/blender/blenlib/intern/storage.c (+17, -0) (Diff)
/source/blender/blenlib/intern/string_cursor_utf8.c (+1, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+12, -3) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -0) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+13, -0) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+27, -24) (Diff)
/source/blender/bmesh/intern/bmesh_interp.c (+46, -0) (Diff)
/source/blender/bmesh/intern/bmesh_interp.h (+2, -0) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operators.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_private.h (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_dissolve.c (+68, -25) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+16, -13) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.h (+1, -0) (Diff)
/source/blender/collada/AnimationImporter.cpp (+18, -3) (Diff)
/source/blender/collada/AnimationImporter.h (+1, -0) (Diff)
/source/blender/collada/ArmatureImporter.cpp (+2, -2) (Diff)
/source/blender/collada/collada_utils.cpp (+15, -0) (Diff)
/source/blender/collada/collada_utils.h (+2, -0) (Diff)
/source/blender/collada/DocumentImporter.cpp (+14, -5) (Diff)
/source/blender/collada/GeometryExporter.h (+4, -3) (Diff)
/source/blender/collada/MeshImporter.cpp (+28, -16) (Diff)
/source/blender/collada/MeshImporter.h (+2, -0) (Diff)
/source/blender/collada/SkinInfo.cpp (+1, -1) (Diff)
/source/blender/editors/animation/anim_filter.c (+43, -19) (Diff)
/source/blender/editors/armature/poseobject.c (+53, -19) (Diff)
/source/blender/editors/interface/interface_draw.c (+5, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+2, -3) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+48, -6) (Diff)
/source/blender/editors/mesh/mesh_data.c (+7, -39) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -0) (Diff)
/source/blender/editors/object/object_add.c (+2, -2) (Diff)
/source/blender/editors/object/object_edit.c (+39, -5) (Diff)
/source/blender/editors/object/object_hook.c (+3, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+1, -0) (Diff)
/source/blender/editors/render/render_opengl.c (+7, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+33, -42) (Diff)
/source/blender/editors/sound/sound_ops.c (+9, -2) (Diff)
/source/blender/editors/space_graph/space_graph.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+6, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+32, -17) (Diff)
/source/blender/editors/space_node/node_ops.c (+5, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+4, -1) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+56, -21) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+68, -50) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -0) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_ops.c (+1, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+36, -26) (Diff)
/source/blender/editors/uvedit/uvedit_smart_stitch.c (+4, -4) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+3, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -1) (Diff)
/source/blender/imbuf/intern/tiff.c (+13, -14) (Diff)
/source/blender/imbuf/intern/util.c (+5, -2) (Diff)
/source/blender/makesdna/DNA_smoke_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_animation.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_animviz.c (+9, -5) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_nla.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+51, -6) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+5, -2) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+6, -5) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+13, -14) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+22, -22) (Diff)
/source/blender/modifiers/intern/MOD_weightvgedit.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgmix.c (+2, -2) (Diff)
/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c (+48, -52) (Diff)
/source/blender/nodes/composite/nodes/node_composite_diffMatte.c (+50, -47) (Diff)
/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c (+112, -49) (Diff)
/source/blender/nodes/intern/node_common.c (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_common.c (+6, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_common.c (+6, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+112, -8) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+93, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.h (+7, -0) (Diff)
/source/blender/python/intern/bpy_props.c (+2, -2) (Diff)
/source/blender/python/intern/bpy_rna.c (+25, -0) (Diff)
/source/blender/render/intern/include/strand.h (+1, -1) (Diff)
/source/blender/render/intern/raytrace/rayobject.cpp (+1, -1) (Diff)
/source/blender/render/intern/source/strand.c (+41, -23) (Diff)
/source/blender/render/intern/source/zbuf.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+11, -1) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+2, -0) (Diff)
/source/creator/creator.c (+1, -1) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.cpp (+6, -0) (Diff)
/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp (+2, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021