[Bf-blender-cvs] [c9769a6] fracture_modifier: Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

[Martin Felke]

Commit: c9769a68082d334b002c449ad204de5acb93967b
Author: Martin Felke
Date:   Thu Oct 9 17:13:27 2014 +0200
Branches: fracture_modifier
https://developer.blender.org/rBc9769a68082d334b002c449ad204de5acb93967b

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
	source/blender/editors/physics/CMakeLists.txt

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



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

diff --cc extern/CMakeLists.txt
index c016576,7e91e19..2c907f7
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@@ -79,16 -83,10 +83,14 @@@ if(WITH_MOD_BOOLEAN
  	add_subdirectory(carve)
  endif()
  
- if(WITH_GHOST_XDND)
- 	if(UNIX AND NOT APPLE)
- 		add_subdirectory(xdnd)
- 	endif()
+ if(WITH_X11 AND WITH_GHOST_XDND)
+ 	add_subdirectory(xdnd)
  endif()
  
 +if(WITH_VORO)
 +	add_subdirectory(voro++)
 +endif()
 +
  if(WITH_GTESTS)
  	add_subdirectory(gtest)
  endif()