[Bf-blender-cvs] [9c1e2267e23] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 9c1e2267e2348cb410122072a15cbcf1bbd25cd6
Author: Mateusz Grzeliński
Date:   Sun Jul 19 10:30:36 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB9c1e2267e2348cb410122072a15cbcf1bbd25cd6

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/blenkernel/intern/cloth.c

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



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

diff --cc source/blender/blenkernel/intern/cloth.c
index 1af63a16620,467bd68c631..b0c0fcd9869
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@@ -614,10 -614,12 +614,10 @@@ void cloth_free_modifier_extern(ClothMo
  
    cloth = clmd->clothObject;
  
 -  if (cloth) {
 -    if (G.debug & G_DEBUG_SIMDATA) {
 -      printf("cloth_free_modifier_extern in\n");
 -    }
 +  CLOG_VERBOSE(&LOG, 1, "free cloth: %p", cloth);
  
 +  if (cloth) {
-     BPH_cloth_solver_free(clmd);
+     SIM_cloth_solver_free(clmd);
  
      // Free the verts.
      if (cloth->verts != NULL) {
diff --cc source/blender/render/CMakeLists.txt
index 93139491dd0,e3c3cf712f9..745ae1fe1b5
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@@ -32,10 -32,9 +32,10 @@@ set(IN
    ../makesdna
    ../makesrna
    ../nodes
-   ../physics
+   ../simulation
    ../../../intern/atomic
    ../../../intern/guardedalloc
 +  ../../../intern/clog
    ../../../intern/mikktspace
    ../../../intern/mantaflow/extern
  )