Merge branch 'master' into texture_rework

This commit is contained in:
Christoph Oelckers 2020-04-29 08:04:15 +02:00
commit 9be63a5093
14 changed files with 217 additions and 33 deletions

View file

@ -6362,7 +6362,7 @@ FxExpression *FxMemberIdentifier::Resolve(FCompileContext& ctx)
if (Object->ValueType->isRealPointer())
{
auto ptype = Object->ValueType->toPointer()->PointedType;
if (ptype->isContainer())
if (ptype && ptype->isContainer())
{
auto ret = ResolveMember(ctx, ctx.Class, Object, static_cast<PContainerType *>(ptype));
delete this;