Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 19 Nov 2017 12:16:14 +0000 (13:16 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 19 Nov 2017 12:16:14 +0000 (13:16 +0100)
14 files changed:
1  2 
build_files/cmake/Modules/FindSndFile.cmake
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/render/buffers.cpp
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/armature/armature_select.c
source/blender/makesrna/intern/rna_image.c
source/gameengine/Ketsji/KX_SoundActuator.cpp

index dd1f560e61fa533431b4af6acdb5f341459c7549,4094b05adabd58861e154a4dd05021949e17121f..c210c523c581900b4ef37a3b74bacf79252d2dcd
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
index 3e7ea039cad97e0c3e5db8850b4967ea07284f7f,635354a9413b1f4fe97c390d0dbc768c52ef61db..a78a636d070d9c82488d71e8315e212f03b06719
@@@ -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,
index 75d9c1fe7fb17c074b4ad9b61c5a8bbaabc109c1,cb71cf756ec996de6f313399b877527d003fd059..d516692ec28c61b6e7256a746d09cd27ef943868
@@@ -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);
        }
  }