Compile fixes for recent commits
authorAntony Riakiotakis <kalast@gmail.com>
Tue, 16 Apr 2013 00:56:24 +0000 (00:56 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Tue, 16 Apr 2013 00:56:24 +0000 (00:56 +0000)
commite93f00d73d8e48fe7aab2949224315c396ddf903
tree8d95f5436a649494bebd403cb85f903a5ab77f28
parentd3a878688e81613fb722f40ba51314fa6964d470
Compile fixes for recent commits
intern/cycles/kernel/osl/osl_services.cpp
source/blender/blenkernel/intern/ocean.c