Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2011-06-27 12:11:05 +0400
committerMiika Hamalainen <blender@miikah.org>2011-06-27 12:11:05 +0400
commitc896fcae7963fb35124ef3fefe0f12679228fa39 (patch)
treef4435bd39a36228a71c9142e4c26bacd482683f3 /source/blender/render/intern/include
parentcb12648656fc001e8c4c6d00df73e52d452f8787 (diff)
parent93bb6238e0c6b7ea008776f4e1c3958ef5382c09 (diff)
Merge with trunk r37849
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r--source/blender/render/intern/include/rayobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/rayobject.h b/source/blender/render/intern/include/rayobject.h
index dea8c1bdb6f..bef7ae6196b 100644
--- a/source/blender/render/intern/include/rayobject.h
+++ b/source/blender/render/intern/include/rayobject.h
@@ -60,7 +60,7 @@ int RE_rayobject_raycast(RayObject *r, struct Isect *i);
RayObject* RE_rayobject_octree_create(int ocres, int size);
RayObject* RE_rayobject_instance_create(RayObject *target, float transform[][4], void *ob, void *target_ob);
-RayObject* RE_rayobject_empty_create();
+RayObject* RE_rayobject_empty_create(void);
RayObject* RE_rayobject_blibvh_create(int size); /* BLI_kdopbvh.c */
RayObject* RE_rayobject_vbvh_create(int size); /* raytrace/rayobject_vbvh.c */