Skip to content

Commit 17e4598

Browse files
committed
Merge pull request #162 from tangziwen/v3
use dummy texture even if in release mode
2 parents cd060e0 + 0d43a8f commit 17e4598

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

cocos/3d/CCSprite3D.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,7 @@ void Sprite3D::removeAllAttachNode()
518518
}
519519
_attachments.clear();
520520
}
521-
522-
#ifndef NDEBUG
521+
#if (!defined NDEBUG) || (defined CC_MODEL_VIEWER)
523522
//Generate a dummy texture when the texture file is missing
524523
static Texture2D * getDummyTexture()
525524
{
@@ -564,9 +563,8 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
564563
}
565564
auto programstate = mesh->getGLProgramState();
566565
auto& meshCommand = mesh->getMeshCommand();
567-
#ifdef NDEBUG
568-
GLuint textureID = mesh->getTexture() ? mesh->getTexture()->getName() : 0;
569-
#else
566+
567+
#if (!defined NDEBUG) || (defined CC_MODEL_VIEWER)
570568
GLuint textureID = 0;
571569
if(mesh->getTexture())
572570
{
@@ -577,7 +575,11 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
577575
mesh->setTexture(texture);
578576
textureID = texture->getName();
579577
}
578+
579+
#else
580+
GLuint textureID = mesh->getTexture() ? mesh->getTexture()->getName() : 0;
580581
#endif
582+
581583
float globalZ = _globalZOrder;
582584
bool isTransparent = (mesh->_isTransparent || color.a < 1.f);
583585
if (isTransparent && Camera::getVisitingCamera())

0 commit comments

Comments
 (0)