missed updating reload scripts

release/scripts/op/wm.py

@@ -411,7 +411,7 @@ class WM_OT_reload_scripts(bpy.types.Operator):
 
     def execute(self, context):
         MOD = type(bpy)
-        bpy.load_scripts(True)
+        bpy.utils.load_scripts(True)
         return {'FINISHED'}
 
 

source/blender/editors/render/render_shading.c

@@ -795,7 +795,7 @@ static int paste_material_exec(bContext *C, wmOperator *op)
 	Material *ma= CTX_data_pointer_get_type(C, "material", &RNA_Material).data;
 
 	if(ma==NULL)
-		return;
+		return OPERATOR_CANCELLED;
 
 	paste_matcopybuf(ma);