[Bf-blender-cvs] [1d9bb5d7b0a] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow
Sebastián Barschkis
noreply at git.blender.org
Sun May 6 00:12:17 CEST 2018
Commit: 1d9bb5d7b0a143b5b936c5574e8871c85e55cc67
Author: Sebastián Barschkis
Date: Sat May 5 23:14:14 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB1d9bb5d7b0a143b5b936c5574e8871c85e55cc67
Merge branch 'master' into fluid-mantaflow
===================================================================
===================================================================
diff --cc intern/openvdb/openvdb_capi.cc
index eb9dd1004fd,1c8b51a23c4..1c51744185f
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@@ -58,10 -59,10 +59,10 @@@ OpenVDBFloatGrid *OpenVDB_export_grid_f
return reinterpret_cast<OpenVDBFloatGrid *>(grid);
}
-OpenVDBIntGrid *OpenVDB_export_grid_ch(
+OpenVDBIntGrid *OpenVDB_export_grid_int(
OpenVDBWriter *writer,
- const char *name, int *data,
- const int res[3], float matrix[4][4],
+ const char *name, unsigned char *data,
+ const int res[3], float matrix[4][4], const float clipping,
OpenVDBFloatGrid *mask)
{
Timer(__func__);
diff --cc intern/openvdb/openvdb_capi.h
index a062d660700,fe7af82769b..7a615aa6fe9
--- a/intern/openvdb/openvdb_capi.h
+++ b/intern/openvdb/openvdb_capi.h
@@@ -49,22 -49,20 +49,20 @@@ enum
struct OpenVDBFloatGrid *OpenVDB_export_grid_fl(
struct OpenVDBWriter *writer,
const char *name, float *data,
- const int res[3], float matrix[4][4],
+ const int res[3], float matrix[4][4], const float clipping,
struct OpenVDBFloatGrid *mask);
- struct OpenVDBIntGrid *OpenVDB_export_grid_int(
- struct OpenVDBWriter *writer,
- const char *name, int *data,
- const int res[3], float matrix[4][4],
- struct OpenVDBFloatGrid *mask);
-struct OpenVDBIntGrid *OpenVDB_export_grid_ch(struct OpenVDBWriter *writer,
- const char *name, unsigned char *data,
++struct OpenVDBIntGrid *OpenVDB_export_grid_int(struct OpenVDBWriter *writer,
++ const char *name, int *data,
+ const int res[3], float matrix[4][4], const float clipping,
+ struct OpenVDBFloatGrid *mask);
- struct OpenVDBVectorGrid *OpenVDB_export_grid_vec(
- struct OpenVDBWriter *writer,
- const char *name,
- const float *data_x, const float *data_y, const float *data_z,
- const int res[3], float matrix[4][4], short vec_type,
- const bool is_color,
- struct OpenVDBFloatGrid *mask);
+ struct OpenVDBVectorGrid *OpenVDB_export_grid_vec(struct OpenVDBWriter *writer,
+ const char *name,
+ const float *data_x, const float *data_y, const float *data_z,
+ const int res[3], float matrix[4][4], short vec_type, const float clipping,
+ const bool is_color,
+ struct OpenVDBFloatGrid *mask);
void OpenVDB_import_grid_fl(
struct OpenVDBReader *reader,
diff --cc release/scripts/addons
index 31e5c6b980a,c88411ff777..69bf667c547
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 31e5c6b980a276850c0da11fab42403ab496a534
-Subproject commit c88411ff7776a2db5d6ef6117a1b2faa42a95611
++Subproject commit 69bf667c5477ea814ac6003a62ab81037ab840d4
diff --cc release/scripts/addons_contrib
index 310578043de,310578043de..cd57934bd04
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6
++Subproject commit cd57934bd04c174fc3402888d01a74e6e6653b2f
diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
index 51c06b1124b,9489fb71e15..2b69f93c862
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@@ -64,106 -56,34 +64,108 @@@ class PHYSICS_PT_smoke(PhysicButtonsPan
if md.smoke_type == 'DOMAIN':
domain = md.domain_settings
+ flow = md.flow_settings
+
+ baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
split = layout.split()
+ split.enabled = not domain.cache_baked_data and not baking_any
+ split.prop(domain, "smoke_domain_type", expand=False)
- split.enabled = not domain.point_cache.is_baked
+ split = layout.split()
+ split.enabled = not domain.cache_baked_data and not baking_any
+ split.label(text="Border collisions:")
+
+ split = layout.split()
+ split.enabled = not domain.cache_baked_data and not baking_any
col = split.column()
- col.label(text="Resolution:")
- col.prop(domain, "resolution_max", text="Divisions")
- col.label(text="Time:")
- col.prop(domain, "time_scale", text="Scale")
- col.label(text="Border Collisions:")
- col.prop(domain, "collision_extents", text="")
- col.label(text="Empty Space:")
- col.prop(domain, "clipping")
+ col.prop(domain, "use_collision_border_front", text="Front")
+ col.prop(domain, "use_collision_border_back", text="Back")
col = split.column()
- col.label(text="Behavior:")
- col.prop(domain, "alpha")
- col.prop(domain, "beta", text="Temp. Diff.")
- col.prop(domain, "vorticity")
- col.prop(domain, "use_dissolve_smoke", text="Dissolve")
- sub = col.column()
- sub.active = domain.use_dissolve_smoke
- sub.prop(domain, "dissolve_speed", text="Time")
- sub.prop(domain, "use_dissolve_smoke_log", text="Slow")
+ col.prop(domain, "use_collision_border_right", text="Right")
+ col.prop(domain, "use_collision_border_left", text="Left")
- elif md.smoke_type == 'FLOW':
+ col = split.column()
+ col.prop(domain, "use_collision_border_top", text="Top")
+ col.prop(domain, "use_collision_border_bottom", text="Bottom")
+
+ split = layout.split()
+
+ split.enabled = not domain.cache_baked_data and not baking_any
+
+ col = split.column(align=True)
+ col.label(text="Domain:")
+ col.prop(domain, "resolution_max", text="Resolution")
+ col.prop(domain, "time_scale", text="Time")
+ col.prop(domain, "use_adaptive_stepping", text="Adaptive stepping")
+ col.prop(domain, "cfl_condition", text="CFL")
+
+ col = split.column()
+ if scene.use_gravity:
+ col.label(text="Use Scene Gravity", icon='SCENE_DATA')
+ sub = col.column()
+ sub.enabled = False
+ sub.prop(domain, "gravity", text="")
+ else:
+ col.label(text="Gravity:")
+ col.prop(domain, "gravity", text="")
++ # TODO (sebas): Clipping var useful for manta openvdb caching?
++ # col.prop(domain, "clipping")
+
+ if domain.smoke_domain_type in {'GAS'}:
+ split = layout.split()
+ split.enabled = not domain.cache_baked_data and not baking_any
+
+ col = split.column(align=True)
+ col.label(text="Smoke:")
+ col.prop(domain, "alpha")
+ col.prop(domain, "beta", text="Temp. Diff.")
+ col.prop(domain, "vorticity")
+ col.prop(domain, "use_dissolve_smoke", text="Dissolve")
+ sub = col.column()
+ sub.active = domain.use_dissolve_smoke
+ sub.prop(domain, "dissolve_speed", text="Time")
+ sub.prop(domain, "use_dissolve_smoke_log", text="Slow")
+
+ col = split.column(align=True)
+ col.label(text="Fire:")
+ col.prop(domain, "burning_rate")
+ col.prop(domain, "flame_smoke")
+ col.prop(domain, "flame_vorticity")
+ col.prop(domain, "flame_ignition")
+ col.prop(domain, "flame_max_temp")
+ col.prop(domain, "flame_smoke_color")
+
+ if domain.smoke_domain_type in {'LIQUID'}:
+ split = layout.split()
+
+ col = split.column(align=True)
+ col1 = col.column()
+ col1.enabled = not domain.cache_baked_data and not baking_any
+ col1.label(text="Liquid:")
+ col1.prop(domain, "particle_maximum")
+ col1.prop(domain, "particle_minimum")
+ col2 = col.column()
+ col2.enabled = not baking_any
+ col2.prop(domain, "use_flip_particles", text="Show FLIP")
+
+ col = split.column(align=True)
+ col.enabled = not domain.cache_baked_data and not baking_any
+ col.label()
+ col.prop(domain, "particle_number")
+ col.prop(domain, "particle_band_width")
+ col.prop(domain, "particle_randomness")
+
+ split = layout.split()
+ split.enabled = not baking_any
+ if domain.cache_baked_data is True:
+ split.operator("manta.free_data", text="Free Data")
+ else:
+ split.operator("manta.bake_data", text="Bake Data")
+ elif md.smoke_type == 'FLOW':
flow = md.flow_settings
layout.prop(flow, "smoke_flow_type", expand=False)
diff --cc source/blender/blenkernel/BKE_object.h
index 43aceadc6cc,7cc43f33e3a..a6434ba2b32
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -144,18 -146,20 +146,21 @@@ struct BoundBox *BKE_object_boundbox_ge
void BKE_object_dimensions_get(struct Object *ob, float vec[3]);
void BKE_object_dimensions_set(struct Object *ob, const float value[3]);
void BKE_object_empty_draw_type_set(struct Object *ob, const int value);
+void BKE_object_draw_type_set(struct Object *ob, const int value);
void BKE_object_boundbox_flag(struct Object *ob, int flag, const bool set);
void BKE_object_minmax(struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
- bool BKE_object_minmax_dupli(struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
+ bool BKE_object_minmax_dupli(
+ struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden);
/* sometimes min-max isn't enough, we need to loop over each point */
- void BKE_ob
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list