Merged changes in the trunk up to revision 51985.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Nov 2012 22:12:19 +0000 (22:12 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 7 Nov 2012 22:12:19 +0000 (22:12 +0000)
23 files changed:
1  2 
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_file/filelist.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge
index f3a3b5c43f85b34a4c1f0533785f1cb430f227d8,5752fd318c701cc3fa8fc1bbd838aa071d6d14b2..fdb6c0afa4e070ed117bd2bbdcf40db4280ff86a
@@@ -53,8 -54,8 +54,9 @@@
  #include "BKE_image.h"
  #include "BKE_movieclip.h"
  #include "BKE_node.h"
+ #include "BKE_sequencer.h"
  #include "BKE_texture.h"
 +#include "BKE_linestyle.h"
  
  #include "ED_node.h"
  
Simple merge