Merged changes in the trunk up to revision 27992.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
15 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c

Simple merge
index d8b21f3eb36409aea931d1270dcf0071e0bcde8c,a044115562969cc3d05cf67365b799c570de179b..11c2ff6e6f4336ededf7ded1fa88bb5d2b36f939
@@@ -48,16 -48,12 +48,16 @@@ void WORLD_OT_new(struct wmOperatorTyp
  void MATERIAL_OT_copy(struct wmOperatorType *ot);
  void MATERIAL_OT_paste(struct wmOperatorType *ot);
  
- void MATERIAL_OT_mtex_copy(struct wmOperatorType *ot);
- void MATERIAL_OT_mtex_paste(struct wmOperatorType *ot);
  void SCENE_OT_render_layer_add(struct wmOperatorType *ot);
  void SCENE_OT_render_layer_remove(struct wmOperatorType *ot);
 +void SCENE_OT_freestyle_module_add(struct wmOperatorType *ot);
 +void SCENE_OT_freestyle_module_remove(struct wmOperatorType *ot);
 +void SCENE_OT_freestyle_module_move_up(struct wmOperatorType *ot);
 +void SCENE_OT_freestyle_module_move_down(struct wmOperatorType *ot);
  
+ void TEXTURE_OT_slot_copy(struct wmOperatorType *ot);
+ void TEXTURE_OT_slot_paste(struct wmOperatorType *ot);
  void TEXTURE_OT_slot_move(struct wmOperatorType *ot);
  void TEXTURE_OT_envmap_save(struct wmOperatorType *ot);
  void TEXTURE_OT_envmap_clear(struct wmOperatorType *ot);
Simple merge