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

Sebastián Barschkis noreply at git.blender.org
Sun Oct 9 01:51:01 CEST 2016


Commit: 9c7d8fea1b0714ecef3ae2e6989395720586c350
Author: Sebastián Barschkis
Date:   Sun Oct 9 00:53:18 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB9c7d8fea1b0714ecef3ae2e6989395720586c350

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc CMakeLists.txt
index d99dd04,9331418..fbf256e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -592,14 -609,14 +610,14 @@@ if(APPLE
  
  	if(${XCODE_VERSION} VERSION_LESS 4.3)
  		# use guaranteed existing sdk
--		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)
++		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.10.sdk CACHE PATH "" FORCE)
  	else()
  		# note: xcode-select path could be ambigous,
  		# cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
  		# so i use a selfcomposed bundlepath here  
  		set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
  		message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
--		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
++		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX10.10.sdk) # use guaranteed existing sdk
  		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
  		if(${CMAKE_GENERATOR} MATCHES "Xcode")
  			# to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
diff --cc intern/mantaflow/extern/manta_fluid_API.h
index bd30929,0000000..665ca44
mode 100644,000000..100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@@ -1,122 -1,0 +1,122 @@@
 +/*
 + * ***** BEGIN GPL LICENSE BLOCK *****
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
 + * as published by the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version. 
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software Foundation,
 + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 + *
 + * The Original Code is Copyright (C) 2016 Blender Foundation.
 + * All rights reserved.
 + *
 + * Contributor(s): Sebastian Barschkis (sebbas)
 + *
 + * ***** END GPL LICENSE BLOCK *****
 + */
 +
 +/** \file mantaflow/extern/manta_smoke_API.h
 + *  \ingroup mantaflow
 + */
 +
 +#ifndef MANTA_FLUID_API_H
 +#define MANTA_FLUID_API_H
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +struct FLUID;
 +
 +struct FLUID *smoke_init(int *res, struct SmokeModifierData *smd);
 +void smoke_free(struct FLUID *smoke);
 +size_t smoke_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z */);
 +size_t smoke_get_index2d(int x, int max_x, int y /*, int max_y, int z, int max_z */);
- void smoke_manta_export(struct FLUID* smoke, SmokeModifierData *smd);
- void smoke_step(struct FLUID *smoke, SmokeModifierData *smd);
++void smoke_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
++void smoke_step(struct FLUID *smoke, struct SmokeModifierData *smd);
 +void smoke_dissolve(struct FLUID *smoke, int speed, int log);
 +void smoke_dissolve_wavelet(struct FLUID *smoke, int speed, int log);
 +void smoke_export(struct FLUID *smoke, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **smoke_inflow, float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles);
 +void smoke_turbulence_export(struct FLUID *smoke, float **dens, float **react, float **flame, float **fuel, float **r, float **g, float **b , float **tcu, float **tcv, float **tcw, float **tcu2, float **tcv2, float **tcw2);
 +float *smoke_get_density(struct FLUID *smoke);
 +float *smoke_get_fuel(struct FLUID *smoke);
 +float *smoke_get_react(struct FLUID *smoke);
 +float *smoke_get_heat(struct FLUID *smoke);
 +float *smoke_get_velocity_x(struct FLUID *smoke);
 +float *smoke_get_velocity_y(struct FLUID *smoke);
 +float *smoke_get_velocity_z(struct FLUID *smoke);
 +float *smoke_get_force_x(struct FLUID *smoke);
 +float *smoke_get_force_y(struct FLUID *smoke);
 +float *smoke_get_force_z(struct FLUID *smoke);
 +float *smoke_get_flame(struct FLUID *smoke);
 +float *smoke_get_color_r(struct FLUID *smoke);
 +float *smoke_get_color_g(struct FLUID *smoke);
 +float *smoke_get_color_b(struct FLUID *smoke);
 +void smoke_get_rgba(struct FLUID *smoke, float *data, int sequential);
 +void smoke_turbulence_get_rgba(struct FLUID *smoke, float *data, int sequential);
 +void smoke_get_rgba_from_density(struct FLUID *smoke, float color[3], float *data, int sequential);
 +void smoke_turbulence_get_rgba_from_density(struct FLUID *smoke, float color[3], float *data, int sequential);
 +float *smoke_turbulence_get_density(struct FLUID *smoke);
 +float *smoke_turbulence_get_fuel(struct FLUID *smoke);
 +float *smoke_turbulence_get_react(struct FLUID *smoke);
 +float *smoke_turbulence_get_color_r(struct FLUID *smoke);
 +float *smoke_turbulence_get_color_g(struct FLUID *smoke);
 +float *smoke_turbulence_get_color_b(struct FLUID *smoke);
 +float *smoke_turbulence_get_flame(struct FLUID *smoke);
 +void smoke_turbulence_get_res(struct FLUID *smoke, int *res);
 +int smoke_turbulence_get_cells(struct FLUID *smoke);
 +unsigned char *smoke_get_obstacle(struct FLUID *smoke);
 +void smoke_get_ob_velocity(struct FLUID *smoke, float **x, float **y, float **z);
 +void flame_get_spectrum(unsigned char *spec, int width, float t1, float t2);
 +int smoke_has_heat(struct FLUID *smoke);
 +int smoke_has_fuel(struct FLUID *smoke);
 +int smoke_has_colors(struct FLUID *smoke);
 +int smoke_turbulence_has_fuel(struct FLUID *smoke);
 +int smoke_turbulence_has_colors(struct FLUID *smoke);
 +void smoke_ensure_heat(struct FLUID *smoke, struct SmokeModifierData *smd);
 +void smoke_ensure_fire(struct FLUID *smoke, struct SmokeModifierData *smd);
 +void smoke_ensure_colors(struct FLUID *smoke, struct SmokeModifierData *smd);
 +float *smoke_get_inflow_grid(struct FLUID *smoke);
 +float *smoke_get_fuel_inflow(struct FLUID *smoke);
 +unsigned char *smoke_turbulence_get_obstacle(struct FLUID *smoke);
 +
 +float *liquid_get_phi(struct FLUID *liquid);
 +float *liquid_get_phiinit(struct FLUID *liquid);
 +float *liquid_get_phiobsinit(struct FLUID *liquid);
 +float *liquid_turbulence_get_phi(struct FLUID *liquid);
 +void liquid_ensure_init(struct FLUID *liquid, struct SmokeModifierData *smd);
 +void liquid_save_mesh(struct FLUID *liquid, char *filename);
 +void liquid_save_data(struct FLUID *liquid, char *pathname);
 +void liquid_load_data(struct FLUID *liquid, char *pathname);
 +int liquid_get_num_verts(struct FLUID *liquid);
 +int liquid_get_num_normals(struct FLUID *liquid);
 +int liquid_get_num_triangles(struct FLUID *liquid);
 +float liquid_get_vertex_x_at(struct FLUID *liquid, int i);
 +float liquid_get_vertex_y_at(struct FLUID *liquid, int i);
 +float liquid_get_vertex_z_at(struct FLUID *liquid, int i);
 +float liquid_get_normal_x_at(struct FLUID *liquid, int i);
 +float liquid_get_normal_y_at(struct FLUID *liquid, int i);
 +float liquid_get_normal_z_at(struct FLUID *liquid, int i);
 +float liquid_get_triangle_x_at(struct FLUID *liquid, int i);
 +float liquid_get_triangle_y_at(struct FLUID *liquid, int i);
 +float liquid_get_triangle_z_at(struct FLUID *liquid, int i);
 +void liquid_update_mesh_data(struct FLUID *liquid, char *filename);
 +void liquid_save_mesh_high(struct FLUID *liquid, char *filename);
 +void liquid_save_data_high(struct FLUID *liquid, char *pathname);
 +void liquid_load_data_high(struct FLUID *liquid, char *pathname);
- void liquid_manta_export(struct FLUID* smoke, SmokeModifierData *smd);
++void liquid_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
 +
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +#endif /* MANTA_FLUID_API_H_ */
diff --cc release/datafiles/locale
index fff5b57,dc16605..2b3c19f
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fff5b57dfbe2b69fb85f69715bb92acd3b3f68a2
 -Subproject commit dc166057192ea882b5cc70484d4c8bacd7cb41b4
++Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f
diff --cc release/scripts/addons
index 7e05091,06dad53..2f3e410
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7e05091168f0b1bb01c4164dcfeb80be7b2318b4
 -Subproject commit 06dad53c80801e0e0919f086040e3d9c31bbd0a1
++Subproject commit 2f3e4104de5a1a08ba91900e9e0b0d739ca61a3c
diff --cc release/scripts/addons_contrib
index afb4e53,04af69b..a52733b
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit afb4e53115ce9396db09228b38bb82cf4c7eb00d
 -Subproject commit 04af69be141a5757fc60b44cc1a5b72db524af30
++Subproject commit a52733b58d95ce60ecde95a9eca242e7319c285a
diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
index 271bfd2,df03f23..92de9d3
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@@ -405,32 -349,54 +405,80 @@@ class PHYSICS_PT_smoke_field_weights(Ph
          domain = context.smoke.domain_settings
          effector_weights_ui(self, context, domain.effector_weights, 'SMOKE')
  
 +class OBJECT_OT_RunMantaButton(bpy.types.Operator):
 +    bl_idname = "manta_export_scene.button"
 +    bl_label = "Create Python Script"
 +    
 +    def execute(self, context):
 +        bpy.ops.manta.make_file()
 +        return{'FINISHED'}
 +
 +class PHYSICS_PT_smoke_manta_settings(PhysicButtonsPanel, Panel):
 +    bl_label = "Fluid Export"
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        md = context.smoke
 +        return md and (md.smoke_type == 'DOMAIN')
 +        
 +    def draw(self, context):
 +        layout = self.layout
 +        
 +        domain = context.smoke.domain_settings
 +        split = layout.split()
 +        split.operator("manta_export_scene.button", text="Export Mantaflow Script")
 +        split = layout.split()
 +        split.prop(domain, "manta_filepath")
 +        split

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list