diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
| commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
| tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/blender/render/intern/include/render_types.h | |
| parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
| parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) | |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index b62b18f01e9..9337dc63b62 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -190,7 +190,7 @@ struct Render struct RayObject *raytree; struct RayFace *rayfaces; struct VlakPrimitive *rayprimitives; - float maxdist; /* needed for keeping an incorrect behaviour of SUN and HEMI lights (avoid breaking old scenes) */ + float maxdist; /* needed for keeping an incorrect behavior of SUN and HEMI lights (avoid breaking old scenes) */ /* occlusion tree */ void *occlusiontree; |