Merge from trunk -r 23000:23968.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 25 Oct 2009 06:53:04 +0000 (06:53 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 25 Oct 2009 06:53:04 +0000 (06:53 +0000)
commit03d3527ef709530264a2a8abe70a1c0a1466c3a3
tree8bfa302bc963ebf1310db04f48d8de40a90f538b
parenta11eb1ed7a30cea2c0862c11852b4fa56a210196
parent16c1a2944cd52be2b4f80669ebe145937b4b9275
Merge from trunk -r 23000:23968.
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.
32 files changed:
CMake/macros.cmake
CMakeLists.txt
config/linux2-config.py
config/win32-vc-config.py
config/win64-vc-config.py
release/ui/buttons_data_armature.py
release/ui/buttons_data_bone.py
release/ui/buttons_data_curve.py
release/ui/buttons_data_empty.py
release/ui/buttons_data_modifier.py
release/ui/buttons_data_text.py
release/ui/buttons_object_constraint.py
release/ui/buttons_particle.py
release/ui/buttons_physics_smoke.py
release/ui/space_console.py
release/ui/space_image.py
release/ui/space_info.py
release/ui/space_sequencer.py
release/ui/space_view3d.py
release/ui/space_view3d_toolbar.py
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/BKE_fcurve.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/ED_object.h
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
tools/Blender.py
tools/btools.py