Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-addons
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-addons
Commits
925f9bfe
Commit
925f9bfe
authored
13 years ago
by
Martin Poirier
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
netrender/client.py
+12
-8
12 additions, 8 deletions
netrender/client.py
netrender/utils.py
+1
-1
1 addition, 1 deletion
netrender/utils.py
with
13 additions
and
9 deletions
netrender/client.py
+
12
−
8
View file @
925f9bfe
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
netrender/utils.py
+
1
−
1
View file @
925f9bfe
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment