forked from bartvdbraak/blender
fix [#27414] no-material renders differently in View3D vs BGE
when a texface layer exists this still overrides the default material.
This commit is contained in:
parent
c4dca3890b
commit
0858904571
@ -147,7 +147,7 @@ def create_nb_project_main():
|
|||||||
f.write(' </logicalFolder>\n')
|
f.write(' </logicalFolder>\n')
|
||||||
# default, but this dir is infact not in blender dir so we can ignore it
|
# default, but this dir is infact not in blender dir so we can ignore it
|
||||||
# f.write(' <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
|
# f.write(' <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
|
||||||
f.write(' <sourceFolderFilter>^(__pycache__|.*\.py)$</sourceFolderFilter>\n')
|
f.write(' <sourceFolderFilter>^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$</sourceFolderFilter>\n')
|
||||||
|
|
||||||
f.write(' <sourceRootList>\n')
|
f.write(' <sourceRootList>\n')
|
||||||
f.write(' <Elem>%s</Elem>\n' % SOURCE_DIR) # base_root_rel
|
f.write(' <Elem>%s</Elem>\n' % SOURCE_DIR) # base_root_rel
|
||||||
|
@ -460,7 +460,9 @@ bool ConvertMaterial(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
material->flag[i] |= (mat->ipo!=0)?HASIPO:0;
|
#if 0 /* this flag isnt used anymore */
|
||||||
|
material->flag[i] |= (BKE_animdata_from_id(mat->id) != NULL) ? HASIPO : 0;
|
||||||
|
#endif
|
||||||
/// --------------------------------
|
/// --------------------------------
|
||||||
// mapping methods
|
// mapping methods
|
||||||
material->mapping[i].mapping |= ( mttmp->texco & TEXCO_REFL )?USEREFL:0;
|
material->mapping[i].mapping |= ( mttmp->texco & TEXCO_REFL )?USEREFL:0;
|
||||||
@ -835,6 +837,12 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene,
|
|||||||
else
|
else
|
||||||
ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
|
ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
|
||||||
|
|
||||||
|
/* ckeck for texface since texface _only_ is used as a fallback */
|
||||||
|
if(ma == NULL && tface == NULL) {
|
||||||
|
extern Material defmaterial; /* material.c */
|
||||||
|
ma= &defmaterial;
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
bool visible = true;
|
bool visible = true;
|
||||||
bool twoside = false;
|
bool twoside = false;
|
||||||
|
@ -144,7 +144,7 @@ enum BL_flag
|
|||||||
USEALPHA=4, // use actual alpha channel
|
USEALPHA=4, // use actual alpha channel
|
||||||
TEXALPHA=8, // use alpha combiner functions
|
TEXALPHA=8, // use alpha combiner functions
|
||||||
TEXNEG=16, // negate blending
|
TEXNEG=16, // negate blending
|
||||||
HASIPO=32,
|
/*HASIPO=32,*/ // unused, commeted for now.
|
||||||
USENEGALPHA=64
|
USENEGALPHA=64
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user