Merged revision(s) 57828-57907 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Mon, 1 Jul 2013 15:23:48 +0000 (15:23 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 1 Jul 2013 15:23:48 +0000 (15:23 +0000)
1  2 
intern/cycles/render/scene.h
intern/cycles/render/shader.cpp

Simple merge
index 76b5b2baaa62b2dcb932de6d4113f5fe95738d86,21b43380f2cf951496b6ac451ff3f36aa7dea1c8..72a0645c779eea96d0a67775123e4bf3d8b29dfe
@@@ -16,8 -16,8 +16,9 @@@
   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   */
  
+ #include "background.h"
  #include "bssrdf.h"
 +#include "blackbody.h"
  #include "device.h"
  #include "graph.h"
  #include "light.h"