projects
/
convexer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b81894
)
added shader error info
author
hgn
<hgodden00@gmail.com>
Fri, 29 Apr 2022 17:01:23 +0000
(18:01 +0100)
committer
hgn
<hgodden00@gmail.com>
Fri, 29 Apr 2022 17:01:23 +0000
(18:01 +0100)
__init__.py
patch
|
blob
|
history
platform.py
patch
|
blob
|
history
diff --git
a/__init__.py
b/__init__.py
index 6b6185cb6a208c2844e42d026110df0cc8997204..65e29e90811ea1940c26fe571539dd63a8984784 100644
(file)
--- a/
__init__.py
+++ b/
__init__.py
@@
-1660,7
+1660,7
@@
def cxr_temp_file( fn ):
else:
filepath = bpy.data.filepath
directory = os.path.dirname(filepath)
else:
filepath = bpy.data.filepath
directory = os.path.dirname(filepath)
- return F"{directory}/{fn}
.txt
"
+ return F"{directory}/{fn}"
def cxr_winepath( path ):
if CXR_GNU_LINUX == 1:
def cxr_winepath( path ):
if CXR_GNU_LINUX == 1:
@@
-1789,6
+1789,8
@@
class CXR_COMPILER_CHAIN(bpy.types.Operator):
return {'PASS_THROUGH'}
def invoke(_,context,event):
return {'PASS_THROUGH'}
def invoke(_,context,event):
+ global cxr_error_inf
+
static = _.__class__
wm = context.window_manager
static = _.__class__
wm = context.window_manager
@@
-1834,7
+1836,12
@@
class CXR_COMPILER_CHAIN(bpy.types.Operator):
if ms.material.cxr_data.shader == 'VertexLitGeneric':
errmat = ms.material.name
errnam = brush['object'].name
if ms.material.cxr_data.shader == 'VertexLitGeneric':
errmat = ms.material.name
errnam = brush['object'].name
+
+ cxr_error_inf = ( "Shader error", \
+ F"Vertex shader ({errmat}) used on model ({errnam})" )
+
print( F"Vertex shader {errmat} used on {errnam}")
print( F"Vertex shader {errmat} used on {errnam}")
+ scene_redraw()
return {'CANCELLED'}
a_models = set()
return {'CANCELLED'}
a_models = set()
@@
-1875,7
+1882,12
@@
class CXR_COMPILER_CHAIN(bpy.types.Operator):
errmat = ms.material.name
errnam = obj.name
errmat = ms.material.name
errnam = obj.name
+
+ cxr_error_inf = ( "Shader error", \
+ F"Lightmapped shader ({errmat}) used on model ({errnam})" )
+
print( F"Lightmapped shader {errmat} used on {errnam}")
print( F"Lightmapped shader {errmat} used on {errnam}")
+ scene_redraw()
return {'CANCELLED'}
# Collect images
return {'CANCELLED'}
# Collect images
diff --git
a/platform.py
b/platform.py
index 0bc5e2c73392fc7037677f345e8fb932a46d7c78..4d77268576d77c065eebba50ebe4205acae106d8 100644
(file)
--- a/
platform.py
+++ b/
platform.py
@@
-1
+1
@@
-CXR_GNU_LINUX=
0
+CXR_GNU_LINUX=
1