Merged changes in the trunk up to revision 25149.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Dec 2009 17:25:16 +0000 (17:25 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 6 Dec 2009 17:25:16 +0000 (17:25 +0000)
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

1  2 
release/scripts/ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/SConscript
source/blender/editors/render/render_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/SConscript
source/blender/render/intern/source/pipeline.c

index 9d2e8e618cbbde062b61d8edd734cd57040aaaca,3e1643fab7bb606509b02af50306344452831224..35435f324cc3b6cffa02efd837de68a267a65d1d
@@@ -52,11 -56,10 +56,15 @@@ void ED_operatortypes_render(void
        WM_operatortype_append(SCENE_OT_render_layer_add);
        WM_operatortype_append(SCENE_OT_render_layer_remove);
  
 +      WM_operatortype_append(SCENE_OT_freestyle_module_add);
 +      WM_operatortype_append(SCENE_OT_freestyle_module_remove);
 +      WM_operatortype_append(SCENE_OT_freestyle_module_move_up);
 +      WM_operatortype_append(SCENE_OT_freestyle_module_move_down);
 +
+ #if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT))
+       WM_operatortype_append(SCENE_OT_render_data_set_quicktime_codec);
+ #endif
+       
        WM_operatortype_append(TEXTURE_OT_slot_move);
  }
  
Simple merge
Simple merge