diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-04 23:50:22 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-04 23:50:22 +0400 |
| commit | f9e2f6acd761492c52500bf72e32a4ad5a33757b (patch) | |
| tree | df44ac89101bf0be263a8d53623c9302dca5e59c /source/blender/editors/render/render_ops.c | |
| parent | 65b2ef5b15ae56758f7097df98dbce9ba3fe1454 (diff) | |
| parent | 687c752b75bc488b2de5a4186ba2398b31dbb46e (diff) | |
Merged changes in the trunk up to revision 27992.
Diffstat (limited to 'source/blender/editors/render/render_ops.c')
| -rw-r--r-- | source/blender/editors/render/render_ops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index a5177be0aee..b3375bcc371 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -53,9 +53,6 @@ void ED_operatortypes_render(void) WM_operatortype_append(MATERIAL_OT_copy); WM_operatortype_append(MATERIAL_OT_paste); - - WM_operatortype_append(MATERIAL_OT_mtex_copy); - WM_operatortype_append(MATERIAL_OT_mtex_paste); WM_operatortype_append(SCENE_OT_render_layer_add); WM_operatortype_append(SCENE_OT_render_layer_remove); @@ -69,6 +66,8 @@ void ED_operatortypes_render(void) WM_operatortype_append(SCENE_OT_render_data_set_quicktime_codec); #endif + WM_operatortype_append(TEXTURE_OT_slot_copy); + WM_operatortype_append(TEXTURE_OT_slot_paste); WM_operatortype_append(TEXTURE_OT_slot_move); WM_operatortype_append(TEXTURE_OT_envmap_save); WM_operatortype_append(TEXTURE_OT_envmap_clear); |