[Bf-blender-cvs] [3a7ac7f49c8] soc-2020-fluid-tools: Merge branch 'master' into soc-2020-fluid-tools

[Sriharsha Kotcharlakot]

Commit: 3a7ac7f49c836d9a498d17b0e1f39e83bc20624d
Author: Sriharsha Kotcharlakot
Date:   Mon Aug 10 17:34:22 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rB3a7ac7f49c836d9a498d17b0e1f39e83bc20624d

Merge branch 'master' into soc-2020-fluid-tools

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



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

diff --cc intern/mantaflow/intern/MANTA_main.cpp
index 7070a8ff70b,5997e819ccf..26a112076e6
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@@ -2007,16 -2007,15 +2008,16 @@@ void MANTA::updatePointers(FluidModifie
    string mesh_ext = "_mesh" + id;
    string sn_ext = "_sn" + id;
  
-   mFlags = getPointer<int>("flags" + s_ext, func);
-   mPhiIn = getPointer<float>("phiIn" + s_ext, func);
-   mPhiStaticIn = getPointer<float>("phiSIn" + s_ext, func);
-   mVelocityX = getPointer<float>("x_vel" + s_ext, func);
-   mVelocityY = getPointer<float>("y_vel" + s_ext, func);
-   mVelocityZ = getPointer<float>("z_vel" + s_ext, func);
-   mForceX = getPointer<float>("x_force" + s_ext, func);
-   mForceY = getPointer<float>("y_force" + s_ext, func);
-   mForceZ = getPointer<float>("z_force" + s_ext, func);
-   mPressure = getPointer<float>("pressure" + s_ext, func);
+   mFlags = (smoke || liquid) ? getPointer<int>("flags" + s_ext, func) : nullptr;
+   mPhiIn = (smoke || liquid) ? getPointer<float>("phiIn" + s_ext, func) : nullptr;
+   mPhiStaticIn = (smoke || liquid) ? getPointer<float>("phiSIn" + s_ext, func) : nullptr;
+   mVelocityX = (smoke || liquid) ? getPointer<float>("x_vel" + s_ext, func) : nullptr;
+   mVelocityY = (smoke || liquid) ? getPointer<float>("y_vel" + s_ext, func) : nullptr;
+   mVelocityZ = (smoke || liquid) ? getPointer<float>("z_vel" + s_ext, func) : nullptr;
+   mForceX = (smoke || liquid) ? getPointer<float>("x_force" + s_ext, func) : nullptr;
+   mForceY = (smoke || liquid) ? getPointer<float>("y_force" + s_ext, func) : nullptr;
+   mForceZ = (smoke || liquid) ? getPointer<float>("z_force" + s_ext, func) : nullptr;
++  mPressure = (smoke || liquid) ? getPointer<float>("pressure" + s_ext, func) : nullptr;
  
    /* Outflow. */
    mPhiOutIn = (outflow) ? getPointer<float>("phiOutIn" + s_ext, func) : nullptr;
diff --cc source/blender/makesdna/DNA_volume_types.h
index 1e4467d17c4,30ac67281e2..bf06495edba
--- a/source/blender/makesdna/DNA_volume_types.h
+++ b/source/blender/makesdna/DNA_volume_types.h
@@@ -124,28 -119,5 +123,26 @@@ typedef enum VolumeRenderSpace 
    VOLUME_SPACE_WORLD = 1,
  } VolumeRenderSpace;
  
 +/* VolumeDisplay.interpolation_method */
 +typedef enum VolumeInterpolationMethod {
 +  VOLUME_INTERPOLATION_LINEAR = 0,
 +  VOLUME_INTERPOLATION_CUBIC = 1,
 +  VOLUME_INTERPOLATION_RAW = 2,
 +} VolumeInterpolationMethod;
 +
 +/* VolumeDisplay.axis_slice_method */
 +typedef enum AxisAlignedSlicingMethod {
 +  VOLUME_AXIS_SLICE_FULL = 0,
 +  VOLUME_AXIS_SLICE_SINGLE = 1,
 +} AxisAlignedSlicingMethod;
 +
 +/* VolumeDisplay.slice_axis */
 +typedef enum SliceAxis {
 +  VOLUME_SLICE_AXIS_AUTO = 0,
 +  VOLUME_SLICE_AXIS_X = 1,
 +  VOLUME_SLICE_AXIS_Y = 2,
 +  VOLUME_SLICE_AXIS_Z = 3,
 +} SliceAxis;
 +
  /* Only one material supported currently. */
  #define VOLUME_MATERIAL_NR 1
- 
- #endif /* __DNA_VOLUME_TYPES_H__ */