[Bf-blender-cvs] [2a789871e2c] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow

[Sebastián Barschkis]

Commit: 2a789871e2c31f8268a33ae6b63a909d1da7b29a
Author: Sebastián Barschkis
Date:   Wed Sep 25 15:02:47 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2a789871e2c31f8268a33ae6b63a909d1da7b29a

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 14dfb3047dd,834f4dd1b9e..ec2e59ceb9a
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -50,6 -49,10 +50,9 @@@ set(IN
    ../../../intern/mikktspace
    ../../../intern/opensubdiv
    ../../../extern/curve_fit_nd
 -  ../../../intern/smoke/extern
+ 
+   # dna_type_offsets.h
+   ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
  )
  
  set(INC_SYS
diff --cc source/blender/blenloader/intern/readfile.c
index c775c83344d,6a495e61c9b..49ff4169ff0
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5335,12 -5326,12 +5326,12 @@@ static void lib_link_object(FileData *f
        }
  
        {
 -        SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob,
 -                                                                           eModifierType_Smoke);
 +        MantaModifierData *mmd = (MantaModifierData *)modifiers_findByType(ob,
 +                                                                           eModifierType_Manta);
  
 -        if (smd && (smd->type == MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
 -          /* Flag for refreshing the simulation after loading. */
 -          smd->domain->flags |= MOD_SMOKE_FILE_LOAD;
 +        if (mmd && (mmd->type == MOD_MANTA_TYPE_DOMAIN) && mmd->domain) {
-           mmd->domain->flags |=
-               FLUID_DOMAIN_FILE_LOAD; /* flag for refreshing the simulation after loading */
++          /* Flag for refreshing the simulation after loading */
++          mmd->domain->flags |= FLUID_DOMAIN_FILE_LOAD;
          }
        }
  
diff --cc source/blender/blenloader/intern/versioning_260.c
index 41a690563d8,4e0be8ceb9c..c743bd27242
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@@ -39,8 -39,10 +39,10 @@@
  #include "DNA_view3d_types.h"
  #include "DNA_screen_types.h"
  #include "DNA_sdna_types.h"
 -#include "DNA_smoke_types.h"
 +#include "DNA_manta_types.h"
  #include "DNA_space_types.h"
+ #include "DNA_world_types.h"
+ #include "DNA_light_types.h"
  
  #include "MEM_guardedalloc.h"
  
diff --cc source/blender/blenloader/intern/versioning_270.c
index b8b5b0de719,a3dc177262e..fef9d2d0a56
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -46,8 -46,9 +46,9 @@@
  #include "DNA_particle_types.h"
  #include "DNA_linestyle_types.h"
  #include "DNA_view3d_types.h"
 -#include "DNA_smoke_types.h"
 +#include "DNA_manta_types.h"
  #include "DNA_rigidbody_types.h"
+ #include "DNA_light_types.h"
  
  #include "DNA_genfile.h"
  
diff --cc source/blender/editors/space_view3d/CMakeLists.txt
index f15cccd5dcd,7c75f0ea907..b95ff435d0c
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@@ -32,7 -32,10 +32,10 @@@ set(IN
    ../../windowmanager
    ../../../../intern/glew-mx
    ../../../../intern/guardedalloc
 -  ../../../../intern/smoke/extern
 +  ../../../../intern/mantaflow/extern
+ 
+   # dna_type_offsets.h
+   ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  )
  
  set(INC_SYS
diff --cc source/blender/gpu/CMakeLists.txt
index a321ea33e0f,bc08da4b2cb..670fdccecdf
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -242,9 -330,11 +330,11 @@@ data_to_c_simple(shaders/gpu_shader_gpe
  
  data_to_c_simple(shaders/gpu_shader_cfg_world_clip_lib.glsl SRC)
  
+ data_to_c_simple(shaders/gpu_shader_common_obinfos_lib.glsl SRC)
+ 
  
 -if(WITH_MOD_SMOKE)
 -  add_definitions(-DWITH_SMOKE)
 +if(WITH_MOD_MANTA)
 +  add_definitions(-DWITH_MANTA)
  endif()
  
  add_definitions(${GL_DEFINITIONS})