Merged changes in the trunk up to revision 27752.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 25 Mar 2010 21:40:08 +0000 (21:40 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 25 Mar 2010 21:40:08 +0000 (21:40 +0000)
16 files changed:
1  2 
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c

index ce72a5c7f2f0a3d74489419efbfd6ee6395cbe11,1876aa5b44a23bea59fe05a31b0a404315299e74..b0ffcb69b1f90b6053d066258440e59a18802c66
  
  #include "GPU_material.h"
  
 +#include "FRS_freestyle.h"
 +
  #include "RNA_access.h"
- #include "RNA_enum_types.h"
  
  #include "WM_api.h"
  #include "WM_types.h"
Simple merge
Simple merge
Simple merge