092e708ee1
After the merge operation, running the diff command showed that the branch had a significant amount of differences from the trunk revision 25149. I had no idea where these differences came from. To resolve them and make the branch up-to-date, I just copied the following files from the trunk: release/scripts/io/import_anim_bvh.py release/scripts/io/import_scene_obj.py release/scripts/ui/space_image.py release/scripts/ui/space_view3d.py source/blender/blenkernel/intern/object.c source/blender/blenlib/BLI_math_base.h source/blender/blenlib/intern/math_base.c source/blender/editors/animation/anim_markers.c source/blender/editors/armature/armature_intern.h source/blender/editors/armature/armature_ops.c source/blender/editors/armature/editarmature.c source/blender/editors/curve/curve_intern.h source/blender/editors/curve/curve_ops.c source/blender/editors/include/ED_mesh.h source/blender/editors/include/ED_object.h source/blender/editors/include/ED_particle.h source/blender/editors/mesh/editface.c source/blender/editors/mesh/editmesh_mods.c source/blender/editors/mesh/mesh_intern.h source/blender/editors/mesh/mesh_ops.c source/blender/editors/metaball/mball_edit.c source/blender/editors/metaball/mball_intern.h source/blender/editors/metaball/mball_ops.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_lattice.c source/blender/editors/object/object_ops.c source/blender/editors/object/object_select.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_ops.c source/blender/editors/sculpt_paint/paint_intern.h source/blender/editors/sculpt_paint/paint_ops.c source/blender/editors/sculpt_paint/paint_utils.c source/blender/editors/space_view3d/view3d_select.c source/blender/editors/uvedit/uvedit_ops.c source/blender/windowmanager/WM_api.h source/blender/windowmanager/intern/wm_operators.c
Welcome to the fun world of open source. For instructions on building and installing Blender, please see the file named INSTALL. ---------------------.Blanguages and the .blender directory--------------------- The .blender directory holds various data files for Blender. In the 2.28a release those are the .Blanguages file containing a list of translations, the translations themselves and a default ttf font. Blender checks for the presence of this directory in several locations: - the current directory - your home directory - On OSX, the blender bundle is also checked - On Windows, the installation dir is checked. If you get a 'File ".Blanguages" not found' warning, try to copy the .blender dir to one of these locations (your home directory being recommended). -------------------------------------Links-------------------------------------- Getting Involved: http://www.blender.org/community/get-involved Community: http://www.blender.org/Community Main blender development site: http://www.blender.org The Blender project homepage: http://projects.blender.org/projects/bf-blender Documentation: http://www.blender.org/education-help Bug tracker: http://www.blender.org/development/report-a-bug Feature request tracker: http://wiki.blender.org/index.php/Requests