Skip to content
Snippets Groups Projects
Commit 925f9bfe authored by Martin Poirier's avatar Martin Poirier
Browse files

netrender fixes

exception safeguard in render engine
fix module import broken by someone else
parent 1932b0f6
No related branches found
No related tags found
No related merge requests found
...@@ -267,14 +267,18 @@ class NetworkRenderEngine(bpy.types.RenderEngine): ...@@ -267,14 +267,18 @@ class NetworkRenderEngine(bpy.types.RenderEngine):
bl_label = "Network Render" bl_label = "Network Render"
bl_use_postprocess = False bl_use_postprocess = False
def render(self, scene): def render(self, scene):
if scene.network_render.mode == "RENDER_CLIENT": try:
self.render_client(scene) if scene.network_render.mode == "RENDER_CLIENT":
elif scene.network_render.mode == "RENDER_SLAVE": self.render_client(scene)
self.render_slave(scene) elif scene.network_render.mode == "RENDER_SLAVE":
elif scene.network_render.mode == "RENDER_MASTER": self.render_slave(scene)
self.render_master(scene) elif scene.network_render.mode == "RENDER_MASTER":
else: self.render_master(scene)
print("UNKNOWN OPERATION MODE") else:
print("UNKNOWN OPERATION MODE")
except Exception as e:
self.report('ERROR', str(e))
raise e
def render_master(self, scene): def render_master(self, scene):
netsettings = scene.network_render netsettings = scene.network_render
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# ##### END GPL LICENSE BLOCK ##### # ##### END GPL LICENSE BLOCK #####
import sys, os import sys, os, re
import http, http.client, http.server, socket import http, http.client, http.server, socket
import subprocess, time, hashlib import subprocess, time, hashlib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment