[Bf-blender-cvs] [97a50e7] alembic_pointcache: Merge branch 'master' into alembic_pointcache

[Lukas Tönne]

Commit: 97a50e78ca88b4ffe180bc6567e5ed0358239efe
Author: Lukas Tönne
Date:   Mon Nov 17 14:59:25 2014 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB97a50e78ca88b4ffe180bc6567e5ed0358239efe

Merge branch 'master' into alembic_pointcache

Conflicts:
	CMakeLists.txt
	source/blender/blenkernel/intern/rigidbody.c
	source/blender/makesrna/intern/rna_object_force.c

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



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

diff --cc CMakeLists.txt
index b224b91,924684c..c07af70
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -206,13 -265,9 +265,13 @@@ option(WITH_MOD_REMESH          "Enabl
  # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
  option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
  
 +# Alembic
 +option(WITH_ALEMBIC             "Enable Alembic Support" OFF)
 +option(WITH_HDF5                "Enable HDF5 Support for Alembic" OFF)
 +
  # Image format support
- option(WITH_OPENIMAGEIO         "Enable OpenImageIO Support (http://www.openimageio.org)" OFF)
- option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+ option(WITH_OPENIMAGEIO         "Enable OpenImageIO Support (http://www.openimageio.org)" ON)
+ option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ${_init_IMAGE_OPENEXR})
  option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
  option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
  option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
@@@ -552,14 -614,12 +618,13 @@@ if(NOT WITH_BOOST
  	endmacro()
  
  	set_and_warn(WITH_CYCLES         OFF)
- 	set_and_warn(WITH_MOD_BOOLEAN    OFF)
  	set_and_warn(WITH_AUDASPACE      OFF)
 +	set_and_warn(WITH_ALEMBIC        OFF)
  	set_and_warn(WITH_INTERNATIONAL  OFF)
  
  	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
  	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
- elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_ALEMBIC OR WITH_INTERNATIONAL)
 -elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
++elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_ALEMBIC OR WITH_INTERNATIONAL)
  	# Keep enabled
  else()
  	# Enabled but we don't need it
@@@ -1017,17 -1081,15 +1091,24 @@@ if(UNIX AND NOT APPLE
  		endif()
  	endif()
  
 +	if(WITH_ALEMBIC)
 +		find_package_wrapper(Alembic)
 +		set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARIES} ${BOOST_LIBRARIES})
 +	endif()
 +
 +	if(WITH_HDF5)
 +		find_package_wrapper(HDF5)
 +	endif()
 +
  	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- 	list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm -lpthread)
+ 	list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)
+ 
+ 	find_package(Threads REQUIRED)
+ 	list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT})
+ 
+ 	if(CMAKE_DL_LIBS)
+ 		list(APPEND PLATFORM_LINKLIBS ${CMAKE_DL_LIBS})
+ 	endif()
  
  	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
  		if(NOT WITH_PYTHON_MODULE)
diff --cc source/blender/blenkernel/intern/rigidbody.c
index ed1aa47,4b8f60d..9b5d669
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@@ -1499,8 -1499,8 +1499,8 @@@ void BKE_rigidbody_rebuild_world(Scene 
  	cache = rbw->pointcache;
  
  	/* flag cache as outdated if we don't have a world or number of objects in the simulation has changed */
- 	if (rbw->physics_world == NULL || rbw->numbodies != BLI_countlist(&rbw->group->gobject)) {
+ 	if (rbw->physics_world == NULL || rbw->numbodies != BLI_listbase_count(&rbw->group->gobject)) {
 -		cache->flag |= PTCACHE_OUTDATED;
 +		cache->state.flag |= PTC_STATE_OUTDATED;
  	}
  
  	if (ctime == startframe + 1 && rbw->ltime == startframe) {