1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
diff --git a/src/luxrender/core/__init__.py b/src/luxrender/core/__init__.py
--- a/src/luxrender/core/__init__.py
+++ b/src/luxrender/core/__init__.py
@@ -1212,7 +1212,7 @@
"""
Convert AOVs to Blender images
"""
- from ..outputs.luxcore_api import pyluxcore
+ import pyluxcore
# Structure: {channelType: [pyluxcoreType, is HDR, arrayDepth, optional matching Blender pass]}
attributes = {
@@ -1459,7 +1459,7 @@
LuxLog('ERROR: LuxCore rendering requires pyluxcore')
self.report({'ERROR'}, 'LuxCore rendering requires pyluxcore')
return
- from ..outputs.luxcore_api import pyluxcore
+ import pyluxcore
try:
scene.luxcore_rendering_controls.pause_render = False
@@ -1841,7 +1841,7 @@
if not PYLUXCORE_AVAILABLE:
LuxLog('ERROR: LuxCore preview rendering requires pyluxcore')
return
- from ..outputs.luxcore_api import pyluxcore
+ import pyluxcore
from ..export.luxcore.materialpreview import MaterialPreviewExporter
try:
diff --git a/src/luxrender/export/luxcore/__init__.py b/src/luxrender/export/luxcore/__init__.py
--- a/src/luxrender/export/luxcore/__init__.py
+++ b/src/luxrender/export/luxcore/__init__.py
@@ -28,7 +28,7 @@
import bpy, time, os
from ...outputs import LuxManager, LuxLog
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...extensions_framework import util as efutil
diff --git a/src/luxrender/export/luxcore/camera.py b/src/luxrender/export/luxcore/camera.py
--- a/src/luxrender/export/luxcore/camera.py
+++ b/src/luxrender/export/luxcore/camera.py
@@ -28,7 +28,8 @@
import bpy, math, mathutils
from mathutils import Vector
-from ...outputs.luxcore_api import pyluxcore, set_prop_cam
+import pyluxcore
+from ...outputs.luxcore_api import set_prop_cam
from ...export import get_worldscale
from ...export import object_anim_matrices
from ...export import fix_matrix_order
diff --git a/src/luxrender/export/luxcore/config.py b/src/luxrender/export/luxcore/config.py
--- a/src/luxrender/export/luxcore/config.py
+++ b/src/luxrender/export/luxcore/config.py
@@ -27,7 +27,7 @@
import os
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...extensions_framework import util as efutil
from ...export import get_output_filename
from .utils import is_lightgroup_opencl_compatible
diff --git a/src/luxrender/export/luxcore/duplis.py b/src/luxrender/export/luxcore/duplis.py
--- a/src/luxrender/export/luxcore/duplis.py
+++ b/src/luxrender/export/luxcore/duplis.py
@@ -26,7 +26,7 @@
#
import math, mathutils, time
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export import matrix_to_list, is_obj_visible
diff --git a/src/luxrender/export/luxcore/lights.py b/src/luxrender/export/luxcore/lights.py
--- a/src/luxrender/export/luxcore/lights.py
+++ b/src/luxrender/export/luxcore/lights.py
@@ -27,7 +27,7 @@
import bpy, mathutils, math, os
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export import is_obj_visible
from ...export import get_worldscale
diff --git a/src/luxrender/export/luxcore/materialpreview.py b/src/luxrender/export/luxcore/materialpreview.py
--- a/src/luxrender/export/luxcore/materialpreview.py
+++ b/src/luxrender/export/luxcore/materialpreview.py
@@ -27,7 +27,7 @@
from mathutils import Matrix
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...export import matrix_to_list
from . import LuxCoreExporter
diff --git a/src/luxrender/export/luxcore/materials.py b/src/luxrender/export/luxcore/materials.py
--- a/src/luxrender/export/luxcore/materials.py
+++ b/src/luxrender/export/luxcore/materials.py
@@ -27,7 +27,7 @@
import bpy
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export.materials import get_texture_from_scene
from ...export import get_expanded_file_name
diff --git a/src/luxrender/export/luxcore/meshes.py b/src/luxrender/export/luxcore/meshes.py
--- a/src/luxrender/export/luxcore/meshes.py
+++ b/src/luxrender/export/luxcore/meshes.py
@@ -29,7 +29,7 @@
import bpy
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
diff --git a/src/luxrender/export/luxcore/objects.py b/src/luxrender/export/luxcore/objects.py
--- a/src/luxrender/export/luxcore/objects.py
+++ b/src/luxrender/export/luxcore/objects.py
@@ -28,7 +28,7 @@
import os
from ...extensions_framework import util as efutil
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export import is_obj_visible
from ...export import object_anim_matrices
diff --git a/src/luxrender/export/luxcore/textures.py b/src/luxrender/export/luxcore/textures.py
--- a/src/luxrender/export/luxcore/textures.py
+++ b/src/luxrender/export/luxcore/textures.py
@@ -28,7 +28,7 @@
import bpy, math, mathutils, os, tempfile
from ...extensions_framework import util as efutil
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export import matrix_to_list
from ...export import get_expanded_file_name
diff --git a/src/luxrender/export/luxcore/utils.py b/src/luxrender/export/luxcore/utils.py
--- a/src/luxrender/export/luxcore/utils.py
+++ b/src/luxrender/export/luxcore/utils.py
@@ -27,7 +27,7 @@
from math import pi
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...outputs.luxcore_api import ToValidLuxCoreName
from ...export.materials import get_texture_from_scene
from ...export import get_worldscale
diff --git a/src/luxrender/export/luxcore/volumes.py b/src/luxrender/export/luxcore/volumes.py
--- a/src/luxrender/export/luxcore/volumes.py
+++ b/src/luxrender/export/luxcore/volumes.py
@@ -27,7 +27,7 @@
import math
-from ...outputs.luxcore_api import pyluxcore
+import pyluxcore
from ...properties import find_node_in_volume
from .utils import convert_texture_channel, generate_volume_name
diff --git a/src/luxrender/operators/__init__.py b/src/luxrender/operators/__init__.py
--- a/src/luxrender/operators/__init__.py
+++ b/src/luxrender/operators/__init__.py
@@ -279,7 +279,7 @@
devs.remove(0)
# Create the new list
- from ..outputs.luxcore_api import pyluxcore
+ import pyluxcore
deviceList = pyluxcore.GetOpenCLDeviceList()
for dev in deviceList:
|
