From 3c0c519981fe64c320f5f7d721acf0c44bcfa383 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Fri, 23 Sep 2011 09:28:59 +0000
Subject: [PATCH] =?UTF-8?q?Fixed=20other=20=E2=80=9Creport=20type=E2=80=9D?=
=?UTF-8?q?=20issue=20as=20well?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
io_scene_fbx/export_fbx.py | 6 +++---
netrender/client.py | 2 +-
netrender/operators.py | 18 +++++++++---------
netrender/utils.py | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/io_scene_fbx/export_fbx.py b/io_scene_fbx/export_fbx.py
index c006eb83d..c5f312680 100644
--- a/io_scene_fbx/export_fbx.py
+++ b/io_scene_fbx/export_fbx.py
@@ -1941,9 +1941,9 @@ def save_single(operator, scene, filepath="",
# Warning for scaled, mesh objects with armatures
if abs(ob.scale[0] - 1.0) > 0.05 or abs(ob.scale[1] - 1.0) > 0.05 or abs(ob.scale[1] - 1.0) > 0.05:
- operator.report('WARNING', "Object '%s' has a scale of (%.3f, %.3f, %.3f), " \
- "Armature deformation will not work as expected " \
- "(apply Scale to fix)" % ((ob.name,) + tuple(ob.scale)))
+ operator.report({'WARNING'}, "Object '%s' has a scale of (%.3f, %.3f, %.3f), " \
+ "Armature deformation will not work as expected " \
+ "(apply Scale to fix)" % ((ob.name,) + tuple(ob.scale)))
else:
blenParentBoneName = armob = None
diff --git a/netrender/client.py b/netrender/client.py
index ed94282ba..ebc9824c6 100644
--- a/netrender/client.py
+++ b/netrender/client.py
@@ -277,7 +277,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
else:
print("UNKNOWN OPERATION MODE")
except Exception as e:
- self.report('ERROR', str(e))
+ self.report({'ERROR'}, str(e))
raise e
def render_master(self, scene):
diff --git a/netrender/operators.py b/netrender/operators.py
index e1d65e3be..da5f70464 100644
--- a/netrender/operators.py
+++ b/netrender/operators.py
@@ -147,9 +147,9 @@ class RENDER_OT_netclientsend(bpy.types.Operator):
# Sending file
scene.network_render.job_id = client.clientSendJob(conn, scene, True)
conn.close()
- self.report('INFO', "Job sent to master")
+ self.report({'INFO'}, "Job sent to master")
except Exception as err:
- self.report('ERROR', str(err))
+ self.report({'ERROR'}, str(err))
return {'FINISHED'}
@@ -177,9 +177,9 @@ class RENDER_OT_netclientsendframe(bpy.types.Operator):
# Sending file
scene.network_render.job_id = client.clientSendJob(conn, scene, False)
conn.close()
- self.report('INFO', "Job sent to master")
+ self.report({'INFO'}, "Job sent to master")
except Exception as err:
- self.report('ERROR', str(err))
+ self.report({'ERROR'}, str(err))
return {'FINISHED'}
@@ -421,7 +421,7 @@ class netclientdownload(bpy.types.Operator):
response = conn.getresponse()
if response.status != http.client.OK:
- self.report('ERROR', "Job ID %i not defined on master" % job_id)
+ self.report({'ERROR'}, "Job ID %i not defined on master" % job_id)
return {'ERROR'}
content = response.read()
@@ -472,13 +472,13 @@ class netclientdownload(bpy.types.Operator):
getResults(netsettings.server_address, netsettings.server_port, job_id, job.resolution[0], job.resolution[1], job.resolution[2], frame_ranges)
if nb_error and nb_missing:
- self.report('ERROR', "Results downloaded but skipped %i frames with errors and %i unfinished frames" % (nb_error, nb_missing))
+ self.report({'ERROR'}, "Results downloaded but skipped %i frames with errors and %i unfinished frames" % (nb_error, nb_missing))
elif nb_error:
- self.report('ERROR', "Results downloaded but skipped %i frames with errors" % nb_error)
+ self.report({'ERROR'}, "Results downloaded but skipped %i frames with errors" % nb_error)
elif nb_missing:
- self.report('WARNING', "Results downloaded but skipped %i unfinished frames" % nb_missing)
+ self.report({'WARNING'}, "Results downloaded but skipped %i unfinished frames" % nb_missing)
else:
- self.report('INFO', "All results downloaded")
+ self.report({'INFO'}, "All results downloaded")
return {'FINISHED'}
diff --git a/netrender/utils.py b/netrender/utils.py
index f1e8640b0..be0cfdd66 100644
--- a/netrender/utils.py
+++ b/netrender/utils.py
@@ -156,7 +156,7 @@ def clientConnection(address, port, report = None, scan = True, timeout = 5):
reporting(report, "Incorrect master version", ValueError)
except BaseException as err:
if report:
- report('ERROR', str(err))
+ report({'ERROR'}, str(err))
return None
else:
print(err)
--
GitLab