diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-03-07 01:30:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-07 01:30:09 +0300 |
commit | c50bfd486e4e28a6bb42ca734e7950f9cabb7435 (patch) | |
tree | e968a6dbc7c4f1218f86c554a1dac4a9096afd87 /source | |
parent | 26fae8985bbc754325a15a77ca20a63a9669b2dd (diff) |
fix for using an un-initialized pointer & quiet compiler wanring on raytrace test.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject.cpp | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index a85a3255a7b..19e41b0f92a 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -450,6 +450,7 @@ int RE_rayobject_intersect(RayObject *r, Isect *i) return r->api->raycast( r, i ); } else assert(0); + return 0; /* wont reach this, quiet compilers */ } void RE_rayobject_add(RayObject *r, RayObject *o) diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 61fcb7e08f2..df0271d880a 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2627,7 +2627,7 @@ static void init_render_dm(DerivedMesh *dm, Render *re, ObjectRen *obr, int a, a1, end, totvert, vertofs; VertRen *ver; VlakRen *vlr; - Curve *cu; + Curve *cu= NULL; MVert *mvert = NULL; MFace *mface; Material *ma; |