Merged changes in the trunk up to revision 27420.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 11 Mar 2010 20:04:25 +0000 (20:04 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 11 Mar 2010 20:04:25 +0000 (20:04 +0000)
17 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_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
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

Simple merge
@@@ -46,15 -48,28 +48,32 @@@ 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_move(struct wmOperatorType *ot);
+ void TEXTURE_OT_envmap_save(struct wmOperatorType *ot);
+ void TEXTURE_OT_envmap_clear(struct wmOperatorType *ot);
+ void TEXTURE_OT_envmap_clear_all(struct wmOperatorType *ot);
+ /* render_internal.c */
+ void RENDER_OT_view_show(struct wmOperatorType *ot);
+ void RENDER_OT_render(struct wmOperatorType *ot);
+ void RENDER_OT_view_cancel(struct wmOperatorType *ot);
+ /*render_opengl.c uses these */
+ void image_buffer_rect_update(struct Scene *scene, struct RenderResult *rr, struct ImBuf *ibuf, volatile struct rcti *renrect);
+ void screen_set_image_output(struct bContext *C, int mx, int my);
  
+ /* render_opengl.c */
+ void RENDER_OT_opengl(struct wmOperatorType *ot);
  
  #endif /* RENDER_INTERN_H */
  
Simple merge
Simple merge
Simple merge