diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/render/intern/raytrace/rayobject_empty.cpp | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/render/intern/raytrace/rayobject_empty.cpp')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_empty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_empty.cpp b/source/blender/render/intern/raytrace/rayobject_empty.cpp index 55696b5b827..eacec0b7eb9 100644 --- a/source/blender/render/intern/raytrace/rayobject_empty.cpp +++ b/source/blender/render/intern/raytrace/rayobject_empty.cpp @@ -72,7 +72,7 @@ static RayObjectAPI empty_api = RE_rayobject_empty_hint_bb }; -static RayObject empty_raytree = { &empty_api, {0, 0} }; +static RayObject empty_raytree = { &empty_api, {NULL, NULL} }; RayObject *RE_rayobject_empty_create() { |