[Bf-blender-cvs] [ab4eb7a] gooseberry: Merge branch 'master' into gooseberry

[Bastien Montagne]

Commit: ab4eb7a714da6da8342009d8dd13e3072b0eb7a0
Author: Bastien Montagne
Date:   Wed Feb 11 17:27:08 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBab4eb7a714da6da8342009d8dd13e3072b0eb7a0

Merge branch 'master' into gooseberry

===================================================================



===================================================================

diff --cc source/blender/makesdna/DNA_scene_types.h
index 08eb221,2d2ee4a..2898a2e
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -46,8 -46,8 +46,9 @@@ extern "C" 
  #include "DNA_listBase.h"
  #include "DNA_ID.h"
  #include "DNA_freestyle_types.h"
 +#include "DNA_gpu_types.h"
  
+ struct CurveMapping;
  struct Object;
  struct Brush;
  struct World;