Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-07-16 15:42:07 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-16 15:42:07 +0400
commit925c5010e8d5a132d4f64622602fddef1344211e (patch)
tree00bfae89ec41d86e79f9a1e5f2b791e71fc042a4 /source/blender/editors/render
parent7430701600ec1bd5538af2f816c36e8187f0beeb (diff)
fix for checking char arrays against NULL, instead check their first character. also remove some dead code (return directly after return).
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index b9653da47e6..51bf1379605 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -831,9 +831,10 @@ static void render_view3d_renderinfo_cb(void *rjp, RenderStats *rs)
RenderPreview *rp = rjp;
/* during render, rv3d->engine can get freed */
- if (rp->rv3d->render_engine == NULL)
+ if (rp->rv3d->render_engine == NULL) {
*rp->stop = 1;
- else if (rp->engine->text) {
+ }
+ else if (rp->engine->text[0]) {
make_renderinfo_string(rs, rp->scene, false, rp->engine->text);
/* make jobs timer to send notifier */