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

[Lukas Tönne]

Commit: ed1974075126c9bc93047e01d2d2a86580a73b20
Author: Lukas Tönne
Date:   Fri Oct 10 10:33:09 2014 +0200
Branches: gooseberry hair_immediate_fixes
https://developer.blender.org/rBed1974075126c9bc93047e01d2d2a86580a73b20

Merge branch 'master' into hair_immediate_fixes

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 0a5b194,f4a3a0c..d10a738
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -36,9 -36,9 +36,10 @@@ set(IN
  	../bmesh
  	../modifiers
  	../nodes
 +	../physics
  	../render/extern/include
  	../../../intern/guardedalloc
+ 	../../../intern/glew-mx
  	../../../intern/iksolver/extern
  	../../../intern/memutil
  	../../../intern/mikktspace
diff --cc source/blender/blenkernel/SConscript
index 6406d13,9243c85..8b7ec65
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@@ -63,10 -64,8 +64,9 @@@ incs = 
      '../makesrna',
      '../modifiers',
      '../nodes',
 +    '../physics',
      '../render/extern/include',
      '../windowmanager',
-     env['BF_OPENGL_INC'],
      env['BF_ZLIB_INC'],
      ]
  incs = ' '.join(incs)