projects
/
convexer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fixes
[convexer.git]
/
__init__.py
diff --git
a/__init__.py
b/__init__.py
index 0e4ddd283edf8fbbdf125f4f38b01793ee1dc2fe..cb377479815524c85b349b0ecaae0271bbaa5401 100644
(file)
--- a/
__init__.py
+++ b/
__init__.py
@@
-396,8
+396,8
@@
cxr_graph_mapping = {
{
"ShaderNodeMixRGB":
{
{
"ShaderNodeMixRGB":
{
- "Color1": material_tex_image("
$
basetexture"),
- "Color2": material_tex_image("
$
decaltexture")
+ "Color1": material_tex_image("basetexture"),
+ "Color2": material_tex_image("decaltexture")
},
"ShaderNodeTexImage":
{
},
"ShaderNodeTexImage":
{
@@
-412,7
+412,7
@@
cxr_graph_mapping = {
{
"ShaderNodeNormalMap":
{
{
"ShaderNodeNormalMap":
{
- "Color": material_tex_image("
$
bumpmap")
+ "Color": material_tex_image("bumpmap")
}
}
}
}
}
}
@@
-957,12
+957,17
@@
class CXR_WRITE_VMF(bpy.types.Operator):
def _collect(collection,transform):
if collection.name.startswith('.'):
return
def _collect(collection,transform):
if collection.name.startswith('.'):
return
+
+ if collection.hide_render:
+ return
if collection.name.startswith('mdl_'):
_collect.heros += [(collection,transform)]
return
for obj in collection.objects:
if collection.name.startswith('mdl_'):
_collect.heros += [(collection,transform)]
return
for obj in collection.objects:
+ if obj.hide_get(): continue
+
classname = cxr_classname( obj )
if classname != None:
classname = cxr_classname( obj )
if classname != None:
@@
-976,6
+981,7
@@
class CXR_WRITE_VMF(bpy.types.Operator):
_collect.a_models = set()
_collect.entities = []
_collect.geo = []
_collect.a_models = set()
_collect.entities = []
_collect.geo = []
+ _collect.heros = []
transform_main = cxr_object_context( context.scene.cxr_data.scale_factor, 0.0 )
transform_sky = cxr_object_context( context.scene.cxr_data.skybox_scale_factor, \
transform_main = cxr_object_context( context.scene.cxr_data.scale_factor, 0.0 )
transform_sky = cxr_object_context( context.scene.cxr_data.skybox_scale_factor, \