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

[Sebastián Barschkis]

Commit: d12bb24d3845f4336355532faec1e581ba984032
Author: Sebastián Barschkis
Date:   Mon Jul 3 19:53:25 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd12bb24d3845f4336355532faec1e581ba984032

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc release/datafiles/locale
index 19a637ce9f3,c93ed11a47b..92f4a9d9f81
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 19a637ce9f38112146daca394af4a7db1bae6687
 -Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
++Subproject commit 92f4a9d9f81d6de6f2b8d1d8531c298e8cc455f2
diff --cc release/scripts/addons
index 0926c1e7dcb,371960484a3..1676f4aa71b
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0926c1e7dcbe566d3a92116c6e8f91ba440f3789
 -Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
++Subproject commit 1676f4aa71bc93be768fcaa60325d17320b7775a
diff --cc release/scripts/addons_contrib
index 7b69758c537,a8515cfdfe9..936e30e8410
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7b69758c5374284653358eb8ce8754f08fab8fe3
 -Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
++Subproject commit 936e30e841089750fdc22e107acb37234d2bcab4
diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
index 15c188529af,4f0d3680834..dee198c0d97
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@@ -53,9 -51,8 +53,9 @@@ class PHYSICS_PT_smoke(PhysicButtonsPan
  
          md = context.smoke
          ob = context.object
 +        scene = context.scene
  
-         layout.prop(md, "smoke_type", expand=True)
+         layout.row().prop(md, "smoke_type", expand=True)
  
          if md.smoke_type == 'DOMAIN':
              domain = md.domain_settings
@@@ -418,29 -316,14 +418,29 @@@ class PHYSICS_PT_smoke_cache(PhysicButt
          layout = self.layout
  
          domain = context.smoke.domain_settings
 -        cache_file_format = domain.cache_file_format
 +        cache_surface_format = domain.cache_surface_format
 +        cache_volume_format = domain.cache_volume_format
 +
 +        split = layout.split()
 +
 +        col = split.column()
 +        col.prop(domain, "use_surface_cache", text="Surface format:")
 +        sub = col.column()
 +        sub.active = domain.use_surface_cache
 +        sub.prop(domain, "cache_surface_format", text="")
 +
 +        col = split.column()
 +        col.prop(domain, "use_volume_cache", text="Volumetric format:")
 +        sub = col.column()
 +        sub.active = domain.use_volume_cache
 +        sub.prop(domain, "cache_volume_format", text="")
  
 -        layout.prop(domain, "cache_file_format")
 +        split = layout.split()
  
 -        if cache_file_format == 'POINTCACHE':
 +        if cache_volume_format == 'POINTCACHE':
              layout.label(text="Compression:")
-             layout.prop(domain, "point_cache_compress_type", expand=True)
-         elif cache_volume_format == 'OPENVDB':
+             layout.row().prop(domain, "point_cache_compress_type", expand=True)
+         elif cache_file_format == 'OPENVDB':
              if not bpy.app.build_options.openvdb:
                  layout.label("Built without OpenVDB support")
                  return