Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-04 23:50:22 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-04 23:50:22 +0400
commitf9e2f6acd761492c52500bf72e32a4ad5a33757b (patch)
treedf44ac89101bf0be263a8d53623c9302dca5e59c /source/blender/editors/render/render_intern.h
parent65b2ef5b15ae56758f7097df98dbce9ba3fe1454 (diff)
parent687c752b75bc488b2de5a4186ba2398b31dbb46e (diff)
Merged changes in the trunk up to revision 27992.
Diffstat (limited to 'source/blender/editors/render/render_intern.h')
-rw-r--r--source/blender/editors/render/render_intern.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index d8b21f3eb36..11c2ff6e6f4 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -48,9 +48,6 @@ void WORLD_OT_new(struct wmOperatorType *ot);
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);
@@ -58,6 +55,9 @@ 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);