forked from bartvdbraak/blender
03d3527ef7
Resolved the 'inconsistent newlines' merge error by updating my svn client. The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was fixed in 1.5.5. Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt. Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files. I removed them with: svn --force remove release/io svn --force remove release/ui svn --force remove source/blender/editors/preview svn --force remove source/blender/editors/physics/ed_fluidsim.c svn --force remove source/blender/editors/physics/editparticle.c svn --force remove source/blender/editors/physics/ed_pointcache.c svn --force remove source/blender/editors/mesh/mesh_layers.c Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without collada. |
||
---|---|---|
.. | ||
bpy_ops.py | ||
buttons_data_armature.py | ||
buttons_data_bone.py | ||
buttons_data_camera.py | ||
buttons_data_curve.py | ||
buttons_data_empty.py | ||
buttons_data_lamp.py | ||
buttons_data_lattice.py | ||
buttons_data_mesh.py | ||
buttons_data_metaball.py | ||
buttons_data_modifier.py | ||
buttons_data_text.py | ||
buttons_game.py | ||
buttons_material.py | ||
buttons_object_constraint.py | ||
buttons_object.py | ||
buttons_particle.py | ||
buttons_physics_cloth.py | ||
buttons_physics_field.py | ||
buttons_physics_fluid.py | ||
buttons_physics_smoke.py | ||
buttons_physics_softbody.py | ||
buttons_scene.py | ||
buttons_texture.py | ||
buttons_world.py | ||
space_buttons.py | ||
space_console.py | ||
space_filebrowser.py | ||
space_image.py | ||
space_info.py | ||
space_logic.py | ||
space_node.py | ||
space_outliner.py | ||
space_sequencer.py | ||
space_text.py | ||
space_time.py | ||
space_userpref.py | ||
space_view3d_toolbar.py | ||
space_view3d.py |