projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
warning fixes.
[blender-staging.git]
/
source
/
blender
/
render
/
intern
/
raytrace
/
rayobject.cpp
diff --git
a/source/blender/render/intern/raytrace/rayobject.cpp
b/source/blender/render/intern/raytrace/rayobject.cpp
index 84ec56e131aac2c87e6832ef15a27c7286accb40..119a62ad05ac3135f3902f65ae7a90014067b4bb 100644
(file)
--- a/
source/blender/render/intern/raytrace/rayobject.cpp
+++ b/
source/blender/render/intern/raytrace/rayobject.cpp
@@
-533,7
+533,11
@@
float RE_rayobject_cost(RayObject *r)
r = RE_rayobject_align( r );
return r->api->cost( r );
}
- else assert(0);
+ else
+ {
+ assert(0);
+ return 1.0; /* XXX, better default value? */
+ }
}
void RE_rayobject_hint_bb(RayObject *r, RayHint *hint, float *min, float *max)