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-13 09:53:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-13 09:53:14 +0400
commitedb850c842608911f5fb0aa5fde298d8e27bcf67 (patch)
tree78b3ee29eae655f167e61f85fdd09686ae978995 /source/blender/blenkernel/intern/material.c
parentfa3699f067fa18e1f1acd5c3aaaf4fb3cc4d8050 (diff)
remove redundant null checks and avoid divide by zero in driver evaluation
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index c8cd65e9477..a445d43da00 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -2051,8 +2051,10 @@ int do_version_tface(Main *main, int fileload)
printf("Warning: material \"%s\" skipped - to convert old game texface to material go to the Help menu.\n", ma->id.name + 2);
nowarning = 0;
}
- else
- convert_tfacematerial(main, ma); continue;
+ else {
+ convert_tfacematerial(main, ma);
+ }
+ continue;
}
/* no conflicts in this material - 90% of cases