[Bf-blender-cvs] [7f96323cd00] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 7f96323cd001bc7555d0f145027e3bbbbc1462b8
Author: Julian Eisel
Date:   Sun Nov 19 13:16:14 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB7f96323cd001bc7555d0f145027e3bbbbc1462b8

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/cmake/Modules/FindSndFile.cmake
index dd1f560e61f,4094b05adab..c210c523c58
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@@ -32,10 -32,9 +32,9 @@@ SET(_sndfile_SEARCH_DIR
    /usr/local
    /sw # Fink
    /opt/local # DarwinPorts
-   /opt/csw # Blastwave
  )
  
 -FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h
 +FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h
    HINTS
      ${_sndfile_SEARCH_DIRS}
    PATH_SUFFIXES
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 3e7ea039cad,635354a9413..a78a636d070
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -994,13 -820,13 +994,14 @@@ void DepsgraphNodeBuilder::build_obdata
  				/* metaball evaluation operations */
  				op_node = add_operation_node(obdata,
  				                             DEG_NODE_TYPE_GEOMETRY,
 -				                             function_bind(BKE_mball_eval_geometry,
 -				                                           _1,
 -				                                           (MetaBall *)obdata),
 +				                             function_bind(
 +				                                     BKE_mball_eval_geometry,
 +				                                     _1,
 +				                                     (MetaBall *)obdata_cow),
  				                             DEG_OPCODE_PLACEHOLDER,
  				                             "Geometry Eval");
- 			} else {
+ 			}
+ 			else {
  				op_node = add_operation_node(obdata,
  				                             DEG_NODE_TYPE_GEOMETRY,
  				                             NULL,
diff --cc source/blender/makesrna/intern/rna_image.c
index 75d9c1fe7fb,cb71cf756ec..d516692ec28
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@@ -176,9 -175,9 +176,9 @@@ static void rna_ImageUser_update(Main *
  
  	BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
  
- 	if(ptr->id.data) {
+ 	if (ptr->id.data) {
  		/* Update material or texture for render preview. */
 -		DAG_id_tag_update(ptr->id.data, 0);
 +		DEG_id_tag_update(ptr->id.data, 0);
  	}
  }