diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
| commit | 1093f69e506e56e0bf605c44aefc34d6f9bc27fe (patch) | |
| tree | d639e38ba6021c1e307bca0ba31a54f47a1fdec4 /source/blender/blenkernel/intern | |
| parent | b6ec6e5ca54ae7d5747f7aa6412be1ab6103ce2d (diff) | |
Style Cleanup
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index e2d64a78c18..0b07f40cad6 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1381,7 +1381,7 @@ void text_idbutton(struct ID *id, char *text) if(id) { if(GS(id->name)==ID_SCE) strcpy(text, "SCE: "); - else if(GS(id->name)==ID_SCE) + else if(GS(id->name)==ID_SCR) strcpy(text, "SCR: "); else if(GS(id->name)==ID_MA && ((Material*)id)->use_nodes) strcpy(text, "NT: "); diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 53b66238ec0..e3639dd1c51 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1917,7 +1917,7 @@ static ImBuf * seq_render_scene_strip_impl( camera= scene->camera; } - if(scene && have_seq==FALSE && camera==NULL) { + if(have_seq==FALSE && camera==NULL) { scene->r.cfra= oldcfra; return NULL; } |