Merged changes in the trunk up to revision 27992.
[blender.git] / source / blender / editors / render / render_ops.c
index a5177be0aee912de0126c405b43735c2e3a0e623..b3375bcc3710cf7fc8c10615d15d23d55e488eeb 100644 (file)
@@ -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);