diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-11 01:15:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-11 01:15:11 +0400 |
commit | d546002476a849524ba938c53a5d9e9a81c50ded (patch) | |
tree | 37a5b2b8eec0832779cfd9bc172e0ac29d3098e6 /source/blender/render/intern/include/render_types.h | |
parent | 28cc31ba11f805c4cac2a250b4181ec9c556b8da (diff) | |
parent | 9cabc57a62e8db17edd09839d7ae200239fb3618 (diff) |
Merged changes in the trunk up to revision 40911.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 1fd377b2afc..63977eb2b21 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -488,7 +488,6 @@ typedef struct VolPrecachePart int res[3]; float bbmin[3]; float voxel[3]; - int working, done; struct Render *re; } VolPrecachePart; |