archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Some more coverity fixes.

Browse Source 
This one moves some pointer checks up in the code 
(they were after the pointer was used, kind of useless at that point) ;)

Kent
This commit is contained in:
Kent Mein
2007-06-07 02:00:11 +00:00
parent 25baab252c
commit 93a3b2b78a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/src/drawoops.c
View File

@@ -341,15 +341,15 @@ void draw_oops(Oops *oops)
if(oops->id== (ID *)((G.scene->basact) ? (G.scene->basact->object) : 0)) line= 1; if(oops->id== (ID *)((G.scene->basact) ? (G.scene->basact->object) : 0)) line= 1;
else if(oops->id== (ID *)G.scene) line= 1; else if(oops->id== (ID *)G.scene) line= 1;
if (!oops->id) return;
if(oops->id->us) { if(oops->id->us) {
cpack(body); cpack(body);
glRectf(x1, y1, x2, y2); glRectf(x1, y1, x2, y2);
} }
/* it has never happened that an oops was missing an ID at if(oops->id->lib) {
this point but has occured elseware so lets be safe */
if(oops->id && oops->id->lib) {
if(oops->id->flag & LIB_INDIRECT) cpack(0x1144FF); if(oops->id->flag & LIB_INDIRECT) cpack(0x1144FF);
else cpack(0x11AAFF); else cpack(0x11AAFF);
@@ -357,7 +357,7 @@ void draw_oops(Oops *oops)
} }
v1[0]= x1; v1[0]= x1;
v1[1] = y1; v1[1] = y1;
if(oops->type==ID_LI) { if(oops->type==ID_LI) {
sprintf(str, " %s", ((Library *)oops->id)->name); sprintf(str, " %s", ((Library *)oops->id)->name);
@@ -430,6 +430,8 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
float col[3]; float col[3];
BIF_GetThemeColor3fv(TH_BACK, col); BIF_GetThemeColor3fv(TH_BACK, col);
if(soops==0) return;
/* darker background for oops */ /* darker background for oops */
if(soops->type!=SO_OUTLINER) { if(soops->type!=SO_OUTLINER) {
@@ -438,7 +440,6 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
glClearColor(col[0], col[1], col[2], 0.0); glClearColor(col[0], col[1], col[2], 0.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
if(soops==0) return;
if(soops->type==SO_OUTLINER) draw_outliner(sa, soops); if(soops->type==SO_OUTLINER) draw_outliner(sa, soops);
else { else {