* Hopefully fix some weird merging business
authorMatt Ebb <matt@mke3.net>
Wed, 26 Aug 2009 06:51:26 +0000 (06:51 +0000)
committerMatt Ebb <matt@mke3.net>
Wed, 26 Aug 2009 06:51:26 +0000 (06:51 +0000)
commit740752da12543c5d6183a6956ed4f439693ba288
treeaa40bddbc4c836952495af93f2a59ec61b65908e
parent163d0bb8114904686fa1227ebfd170fe0a8f5dd3
* Hopefully fix some weird merging business
source/blender/render/intern/include/volume_precache.h
source/blender/render/intern/source/volumetric.c