diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 11:31:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 11:31:17 +0400 |
| commit | fed6b2bcb75a0d67d1b1266fd13d9a4b89dd1923 (patch) | |
| tree | 7d2491890e92fb8e712c54ef897e79324a8150b3 /source/blender/blenkernel/intern | |
| parent | b85056cbf4d0a0cc83db0120599318d368ea8f8c (diff) | |
code cleanup: remove paranoid/invalid NULL checks and also reduce some unneeded size_t -> int conversions.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4fb235ac9f7..5ba56a85c72 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3288,7 +3288,7 @@ void BKE_object_groups_clear(Scene *scene, Base *base, Object *object) { Group *group = NULL; - BLI_assert(base->object == object); + BLI_assert((base == NULL) || (base->object == object)); if (scene && base == NULL) { base = BKE_scene_base_find(scene, object); diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index af5a8f5d59d..3c89fdba13a 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -3070,7 +3070,6 @@ int setcurr_tab_spaces(Text *text, int space) const char *comm = "#"; const char indent = (text->flags & TXT_TABSTOSPACES) ? ' ' : '\t'; static const char *back_words[] = {"return", "break", "continue", "pass", "yield", NULL}; - if (!text) return 0; if (!text->curl) return 0; while (text->curl->line[i] == indent) { |