[Bf-blender-cvs] [55497517748] temp-fracture-modifier-2.8: more compile fixes
Martin Felke
noreply at git.blender.org
Fri Aug 10 14:00:24 CEST 2018
Commit: 5549751774885904987a70f89123f2e27fe6571f
Author: Martin Felke
Date: Tue Aug 7 20:22:10 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB5549751774885904987a70f89123f2e27fe6571f
more compile fixes
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_util.h
R093 source/blender/modifiers/intern/MOD_boolean_util_bmesh.h source/blender/blenkernel/BKE_boolean.h
M source/blender/blenkernel/BKE_fracture.h
M source/blender/blenkernel/BKE_rigidbody.h
M source/blender/blenkernel/CMakeLists.txt
R094 source/blender/modifiers/intern/MOD_boolean_util_bmesh.c source/blender/blenkernel/intern/boolean.c
M source/blender/blenkernel/intern/fracture.c
M source/blender/blenkernel/intern/fracture_automerge.c
M source/blender/blenkernel/intern/fracture_constraints.c
M source/blender/blenkernel/intern/fracture_dynamic.c
M source/blender/blenkernel/intern/fracture_external.c
M source/blender/blenkernel/intern/fracture_util.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/editors/object/object_modifier.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_fracture.c
M source/blender/makesrna/intern/rna_fracture_api.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_fracture.c
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index b484dbc623c..8a6480a9a42 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1253,12 +1253,6 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph& b_depsgraph,
if(b_fluid_domain)
return;
- /* other precalculated motion (remesher for now only) */
- BL::RemeshModifier b_remesher = object_metaball_remesher_find(b_ob);
- BL::FractureModifier b_fracture = object_fracture_modifier_find(b_ob);
- if(b_remesher || b_fracture)
- return;
-
if(ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) {
/* get derived mesh */
b_mesh = object_to_mesh(b_data,
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index 4972b1ae4d8..4e754d22984 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -582,36 +582,6 @@ static inline BL::DomainFluidSettings object_fluid_domain_find(BL::Object b_ob)
return BL::DomainFluidSettings(PointerRNA_NULL);
}
-static inline BL::RemeshModifier object_metaball_remesher_find(BL::Object b_ob)
-{
- BL::Object::modifiers_iterator b_mod;
-
- for(b_ob.modifiers.begin(b_mod); b_mod != b_ob.modifiers.end(); ++b_mod) {
- if(b_mod->is_a(&RNA_RemeshModifier)) {
- BL::RemeshModifier b_fmd(*b_mod);
-
- if(b_fmd.mode() == BL::RemeshModifier::mode_METABALL)
- return b_fmd;
- }
- }
-
- return BL::RemeshModifier(PointerRNA_NULL);
-}
-
-static inline BL::FractureModifier object_fracture_modifier_find(BL::Object b_ob)
-{
- BL::Object::modifiers_iterator b_mod;
-
- for(b_ob.modifiers.begin(b_mod); b_mod != b_ob.modifiers.end(); ++b_mod) {
- if(b_mod->is_a(&RNA_FractureModifier)) {
- BL::FractureModifier b_fmd(*b_mod);
- return b_fmd;
- }
- }
-
- return BL::FractureModifier(PointerRNA_NULL);
-}
-
static inline Mesh::SubdivisionType object_subdivision_type(BL::Object& b_ob, bool preview, bool experimental)
{
PointerRNA cobj = RNA_pointer_get(&b_ob.ptr, "cycles");
diff --git a/source/blender/modifiers/intern/MOD_boolean_util_bmesh.h b/source/blender/blenkernel/BKE_boolean.h
similarity index 93%
rename from source/blender/modifiers/intern/MOD_boolean_util_bmesh.h
rename to source/blender/blenkernel/BKE_boolean.h
index 59c08d8a7ce..8f96dcf3472 100644
--- a/source/blender/modifiers/intern/MOD_boolean_util_bmesh.h
+++ b/source/blender/blenkernel/BKE_boolean.h
@@ -27,7 +27,7 @@
#ifndef MOD_BOOLEAN_UTIL_BMESH_H
#define MOD_BOOLEAN_UTIL_BMESH_H
-struct Mesh *NewBooleanDerivedMeshBMesh(struct Mesh *mesh, struct Object *ob,
+struct Mesh *BKE_boolean_operation(struct Mesh *mesh, struct Object *ob,
struct Mesh *mesh_other, struct Object *ob_other, int op_type,
float double_threshold, struct BooleanModifierData *bmd);
diff --git a/source/blender/blenkernel/BKE_fracture.h b/source/blender/blenkernel/BKE_fracture.h
index 3af2df0dbdd..d28ee6b95b0 100644
--- a/source/blender/blenkernel/BKE_fracture.h
+++ b/source/blender/blenkernel/BKE_fracture.h
@@ -71,102 +71,28 @@ typedef struct FracPointCloud {
int totpoints; /* number of positions */
} FracPointCloud;
-/* direct access */
-struct Shard *BKE_shard_by_id(struct FracMesh *mesh, ShardID id, struct Mesh *dm);
-
-/* detailed info to the particular shards */
-bool BKE_get_shard_minmax(struct FracMesh *mesh, ShardID id, float min_r[3], float max_r[3], struct Mesh *dm);
-
-/* container object handling functions */
-struct FracMesh *BKE_create_fracture_container(void);
-struct Shard *BKE_create_fracture_shard(struct MVert *mvert, struct MPoly *mpoly, struct MLoop *mloop, struct MEdge *medge,
- int totvert, int totpoly, int totloop, int totedge, bool copy);
-void BKE_custom_data_to_shard(struct Shard *s, struct Mesh *dm);
-
-/* utility functions */
-bool BKE_fracture_shard_center_median(struct Shard *shard, float cent[3]);
-bool BKE_fracture_shard_center_centroid(struct Shard *shard, float cent[3]);
-bool BKE_fracture_shard_center_centroid_area(struct Shard *shard, float cent[3]);
-float BKE_shard_calc_minmax(struct Shard *shard);
-
-void BKE_fracmesh_free(struct FracMesh *fm, bool doCustomData);
-void BKE_shard_free(struct Shard *s, bool doCustomData);
-struct Shard* BKE_fracture_shard_copy(struct Shard *s);
-
-
-/* DerivedMesh */
-struct Mesh *BKE_fracture_create_dm(struct FractureModifierData *fmd, bool doCustomData, bool use_packed);
-struct Mesh *BKE_shard_create_dm(struct Shard *s, bool doCustomData);
-
-/* create shards from base mesh and a list of points */
-void BKE_fracture_shard_by_points(struct FractureModifierData* fmd, ShardID id, struct FracPointCloud *points,
- struct Object *obj, struct Mesh *dm, short inner_material_index, float mat[4][4], bool reset,
- int override_count);
-
-/* create shards from a base mesh and a set of other objects / cutter planes */
-void BKE_fracture_shard_by_planes(struct FractureModifierData *fmd, struct Object *obj, short inner_material_index, float mat[4][4]);
-void BKE_fracture_shard_by_greasepencil(struct FractureModifierData *fmd, struct Object *obj, short inner_material_index, float mat[4][4]);
-
-void BKE_match_vertex_coords(struct MeshIsland* mi, struct MeshIsland *par, struct Object *ob, int frame, bool is_parent, bool shards_to_islands);
-bool BKE_lookup_mesh_state(struct FractureModifierData *fmd, int frame, int do_lookup);
-void BKE_get_prev_entries(struct FractureModifierData *fmd);
-void BKE_get_next_entries(struct FractureModifierData *fmd);
-void BKE_fracture_constraints_free(struct FractureModifierData *fmd, struct Scene *scene);
-struct Shard* BKE_create_initial_shard(struct Mesh *dm);
-void BKE_copy_customdata_layers(struct CustomData* dest, struct CustomData *src, int type, int count);
-
-struct MeshIsland *BKE_fracture_mesh_island_add(struct Main *bmain, struct FractureModifierData *fmd, struct Object *own, struct Object *target,
- struct Scene *scene);
-
-void BKE_fracture_mesh_island_remove(struct FractureModifierData *fmd, struct MeshIsland *mi, struct Scene *scene);
-void BKE_fracture_mesh_island_remove_all(struct FractureModifierData *fmd, struct Scene *scene);
-
-struct RigidBodyShardCon* BKE_fracture_mesh_islands_connect(struct Scene *scene, struct FractureModifierData *fmd,
- struct MeshIsland *mi1, struct MeshIsland *mi2, short con_type);
-void BKE_fracture_mesh_constraint_remove(struct FractureModifierData* fmd, struct RigidBodyShardCon *con, struct Scene *scene);
-void BKE_fracture_mesh_constraint_remove_all(struct FractureModifierData *fmd, struct Scene *scene);
-
-void BKE_fracture_free_mesh_island(struct Scene *scene, struct FractureModifierData *rmd, struct MeshIsland *mi,
- bool remove_rigidbody);
-
-int BKE_fracture_update_visual_mesh(struct FractureModifierData *fmd, struct Object *ob, bool do_custom_data);
-short BKE_fracture_collect_materials(struct Main* bmain, struct Object* o, struct Object* ob, int matstart,
- struct GHash** mat_index_map);
-
-void BKE_bm_mesh_hflag_flush_vert(struct BMesh *bm, const char hflag);
-void BKE_meshisland_constraint_create(struct Scene *sc, struct FractureModifierData* fmd, struct MeshIsland *mi1,
- struct MeshIsland *mi2, int con_type, float thresh);
-void BKE_update_acceleration_map(struct FractureModifierData *fmd, struct MeshIsland* mi, struct Object* ob, int ctime, float acc, struct RigidBodyWorld *rbw);
-void BKE_update_velocity_layer(struct FractureModifierData *fmd, struct MeshIsland *mi);
-void BKE_read_animated_loc_rot(struct FractureModifierData *fmd, struct Object *ob, bool do_bind,
- struct Depsgraph* depsgraph);
-
void BKE_fracture_dynamic_free(struct FractureModifierData *fmd,
- bool do_free_sequence, bool do_free_rigidbody);
+ bool do_free_sequence, bool do_free_rigidbody, struct Scene* scene);
struct Mesh* BKE_fracture_prefractured_apply(struct FractureModifierData *fmd, struct Object *ob, struct Mesh *mesh,
struct Depsgraph *depsgraph);
-struct Mesh* BKE_fracture_dynamic_apply(struct FractureModifierData *fmd, struct Object *ob, struct Mesh *mesh);
+struct Mesh* BKE_fracture_dynamic_apply(struct FractureModifierData *fmd, struct Object *ob, struct Mesh *mesh, struct Scene *scene);
struct Mesh* BKE_fracture_external_apply(struct FractureModifierData *fmd, struct Object* ob, struct Mesh* mesh,
struct Mesh *derivedData, struct Scene *scene);
struct Mesh* BKE_fracture_mesh_from_packdata(struct FractureModifierData *fmd, struct Mesh *derivedData);
-void BKE_fracture_dynamic_initialize(struct FractureModifierData* fmd, struct Object *ob,
- struct Mesh* mesh, char (*names)[66]);
-
void BKE_fracture_initialize(struct FractureModifierData* fmd, struct Object *ob,
struct Mesh* mesh, struct Depsgraph *depsgraph);
void BKE_fracture_autohide_refresh(struct FractureModifierData* fmd, struct Object *ob);
void BKE_fracture_automerge_refresh(struct FractureModifierData* fmd);
-struct Mesh* BKE_fracture_mesh_result(struct FractureModifierData* fmd, struct Mesh* me, struct Object* ob,
- bool valid_fractured_mesh);
+struct Mesh *BKE_fracture_result_mesh(struct FractureModifierData* fmd, struct Mesh *dm, struct Object* ob, bool validMesh,
+ struct Scene* scene);
FracPointCloud BKE_fracture_points(struct FractureModifierData *fmd, struct Object *ob, struct Mesh* me, ShardID id);
-struct Mesh* BKE_fracture_create_mesh(struct FractureModifierData *fmd, bool do_custom_dat, bool do_pack);
void BKE_fracture_face_calc_center_mean(struct Mesh *dm, struct MPoly *mp, float r_cent[3]);
struct Shard* BKE_fracture_shard_find(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list