[Bf-blender-cvs] [7ceb28ee7b0] fracture_modifier-master: compile fixes done, need to fix linking now

Martin Felke noreply at git.blender.org
Tue Jun 12 15:54:27 CEST 2018


Commit: 7ceb28ee7b0a27b6e3fa6afd67bf160c831095f4
Author: Martin Felke
Date:   Sat May 26 13:38:06 2018 +0200
Branches: fracture_modifier-master
https://developer.blender.org/rB7ceb28ee7b0a27b6e3fa6afd67bf160c831095f4

compile fixes done, need to fix linking now

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

M	intern/cycles/kernel/svm/svm_closure.h
M	intern/rigidbody/rb_bullet_api.cpp
M	source/blender/blenkernel/BKE_armature.h
M	source/blender/blenkernel/BKE_brush.h
M	source/blender/blenkernel/BKE_fracture.h
M	source/blender/blenkernel/BKE_fracture_util.h
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/fracture.c
M	source/blender/blenkernel/intern/fracture_util.c
M	source/blender/blenkernel/intern/rigidbody.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/interface/interface.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/object/object_modifier.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/physics/rigidbody_constraint.c
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/modifiers/intern/MOD_boolean.c
A	source/blender/modifiers/intern/MOD_boolean_util.h
M	source/blender/modifiers/intern/MOD_fracture.c

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

diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 5ae0e0a6989..886a1333fa3 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -271,12 +271,11 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					bsdf->extra->color = base_color;
 					bsdf->extra->clearcoat = 0.0f;
 
-						/* setup bsdf */
-						if(distribution == CLOSURE_BSDF_MICROFACET_GGX_GLASS_ID || roughness <= 0.075f) /* use single-scatter GGX */
-							sd->flag |= bsdf_microfacet_ggx_aniso_fresnel_setup(bsdf, sd);
-						else /* use multi-scatter GGX */
-							sd->flag |= bsdf_microfacet_multi_ggx_aniso_fresnel_setup(bsdf, sd);
-					}
+					/* setup bsdf */
+					if(distribution == CLOSURE_BSDF_MICROFACET_GGX_GLASS_ID || roughness <= 0.075f) /* use single-scatter GGX */
+						sd->flag |= bsdf_microfacet_ggx_aniso_fresnel_setup(bsdf, sd);
+					else /* use multi-scatter GGX */
+						sd->flag |= bsdf_microfacet_multi_ggx_aniso_fresnel_setup(bsdf, sd);
 				}
 #ifdef __CAUSTICS_TRICKS__
 			}
diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
index 4d9443f54c3..7cf3514c7ea 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -80,6 +80,8 @@ subject to the following restrictions:
 
 #include "../../extern/glew/include/GL/glew.h"
 
+static inline void copy_v3_btvec3(float vec[3], const btVector3 &btvec);
+	
 typedef struct rbConstraint
 {
 	btTypedConstraint *con;
@@ -165,13 +167,6 @@ static btRigidBody* getBodyFromShape(void *shapePtr)
 	return body->body;
 }
 
-static inline void copy_v3_btvec3(float vec[3], const btVector3 &btvec)
-{
-	vec[0] = (float)btvec[0];
-	vec[1] = (float)btvec[1];
-	vec[2] = (float)btvec[2];
-}
-
 typedef void (*rbContactCallback)(rbContactPoint * cp, void *bworld);
 typedef void (*rbTickCallback)(btScalar timeStep, void *bworld);
 
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index fa8c08eb4f8..f6de39c897e 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -173,8 +173,7 @@ void BKE_pose_eval_init(struct EvaluationContext *eval_ctx,
 
 void BKE_pose_eval_init_ik(struct EvaluationContext *eval_ctx,
                            struct Scene *scene,
-                           struct Object *ob,
-                           struct bPose *pose);
+                           struct Object *ob);
 
 void BKE_pose_eval_bone(struct EvaluationContext *eval_ctx,
                         struct Scene *scene,
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index cc2e84d4c73..f2601f2ca32 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -111,8 +111,6 @@ bool BKE_brush_use_size_pressure(const struct Scene *scene, const struct Brush *
 
 bool BKE_brush_sculpt_has_secondary_color(const struct Brush *brush);
 
-bool BKE_brush_sculpt_has_secondary_color(const struct Brush *brush);
-
 /* scale unprojected radius to reflect a change in the brush's 2D size */
 void BKE_brush_scale_unprojected_radius(
         float *unprojected_radius,
diff --git a/source/blender/blenkernel/BKE_fracture.h b/source/blender/blenkernel/BKE_fracture.h
index 3df6182f95c..e82c6410aae 100644
--- a/source/blender/blenkernel/BKE_fracture.h
+++ b/source/blender/blenkernel/BKE_fracture.h
@@ -98,7 +98,7 @@ struct DerivedMesh *BKE_shard_create_dm(struct Shard *s, bool doCustomData);
 void BKE_fracture_shard_by_points(struct FracMesh *fmesh, ShardID id, struct FracPointCloud *points, int algorithm,
                                   struct Object *obj, struct DerivedMesh *dm, short inner_material_index, float mat[4][4],
                                   int num_cuts, float fractal, bool smooth, int num_levels, int mode, bool reset, int active_setting,
-                                  int num_settings, char uv_layer[], bool threaded, int solver, float thresh, bool shards_to_islands,
+                                  int num_settings, char uv_layer[], bool threaded, float thresh, bool shards_to_islands,
                                   int override_count, float factor, int point_source, int resolution[], float spacing[]);
 
 /* create shards from a base mesh and a set of other objects / cutter planes */
diff --git a/source/blender/blenkernel/BKE_fracture_util.h b/source/blender/blenkernel/BKE_fracture_util.h
index c59d8c170a2..2e453ee8df8 100644
--- a/source/blender/blenkernel/BKE_fracture_util.h
+++ b/source/blender/blenkernel/BKE_fracture_util.h
@@ -36,7 +36,8 @@
 #include "DNA_fracture_types.h"
 
 Shard *BKE_fracture_shard_boolean(Object *obj, DerivedMesh *dm_parent, Shard* child, short inner_material_index, int num_cuts, float fractal,
-                                  Shard **other, float mat[4][4], float radius, bool use_smooth_inner, int num_levels, char uv_layer[], int solver, float thresh);
+                                  Shard **other, float mat[4][4], float radius, bool use_smooth_inner, int num_levels, char uv_layer[], float thresh);
+
 Shard *BKE_fracture_shard_bisect(struct BMesh *bm_orig, Shard* child, float obmat[4][4], bool use_fill,
                                  bool clear_inner, bool clear_outer, int cutlimit, float centroid[],
                                  short inner_mat_index, char uv_layer[], struct KDTree *preselect_tree, float normal[]);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 3fdb9713fe5..fa1dcbf8215 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -317,6 +317,7 @@ set(SRC
 	intern/CCGSubSurf_inline.h
 	intern/CCGSubSurf_intern.h
 	intern/pbvh_intern.h
+	../modifiers/intern/MOD_boolean_util.h
 )
 
 if(WITH_BINRELOC)
@@ -510,7 +511,6 @@ if(WITH_VORO)
 	add_definitions(-DWITH_VORO)
 	list(APPEND INC
 		../../../extern/voro++
-		../../../extern/carve
 	)
 endif()
 
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 9c04523ea04..0e19eb09f12 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -739,7 +739,7 @@ static void handle_fast_bisect(FracMesh *fm, int expected_shards, int algorithm,
 
 static void handle_boolean_fractal(Shard* p, Shard* t, int expected_shards, DerivedMesh* dm_parent, Object *obj, short inner_material_index,
                                    int num_cuts, float fractal, int num_levels, bool smooth,int parent_id, int* i, Shard ***tempresults,
-                                   DerivedMesh **dm_p, char uv_layer[64], int solver, int thresh, float fac)
+                                   DerivedMesh **dm_p, char uv_layer[64], int thresh, float fac)
 {
 	/* physics shard and fractalized shard, so we need to booleanize twice */
 	/* and we need both halves, so twice again */
@@ -804,7 +804,7 @@ static void handle_boolean_fractal(Shard* p, Shard* t, int expected_shards, Deri
 		loc_quat_size_to_mat4(matrix, loc, quat, one);
 
 		/*visual shards next, fractalized cuts */
-		s = BKE_fracture_shard_boolean(obj, *dm_p, t, inner_material_index, num_cuts,fractal, &s2, matrix, radius, smooth, num_levels, uv_layer, solver, thresh);
+		s = BKE_fracture_shard_boolean(obj, *dm_p, t, inner_material_index, num_cuts,fractal, &s2, matrix, radius, smooth, num_levels, uv_layer, thresh);
 
 		if (index < max_retries)
 		{
@@ -859,7 +859,7 @@ static void handle_boolean_fractal(Shard* p, Shard* t, int expected_shards, Deri
 static bool handle_boolean_bisect(FracMesh *fm, Object *obj, int expected_shards, int algorithm, int parent_id, Shard **tempshards,
                                   DerivedMesh *dm_parent, BMesh* bm_parent, float obmat[4][4], short inner_material_index, int num_cuts,
                                   int num_levels, float fractal, int *i, bool smooth, Shard*** tempresults, DerivedMesh **dm_p, char uv_layer[64],
-                                  KDTree *preselect_tree, int solver, int thresh, Shard* p, float fac)
+                                  KDTree *preselect_tree, int thresh, Shard* p, float fac)
 {
 	Shard *s = NULL, *t = NULL;
 	if (fm->cancel == 1)
@@ -881,11 +881,11 @@ static bool handle_boolean_bisect(FracMesh *fm, Object *obj, int expected_shards
 
 	/* XXX TODO, need object for material as well, or atleast a material index... */
 	if (algorithm == MOD_FRACTURE_BOOLEAN) {
-		s = BKE_fracture_shard_boolean(obj, dm_parent, t, inner_material_index, 0, 0.0f, NULL, NULL, 0.0f, false, 0, uv_layer, solver, thresh);
+		s = BKE_fracture_shard_boolean(obj, dm_parent, t, inner_material_index, 0, 0.0f, NULL, NULL, 0.0f, false, 0, uv_layer, thresh);
 	}
 	else if (algorithm == MOD_FRACTURE_BOOLEAN_FRACTAL) {
 		handle_boolean_fractal(p, t, expected_shards, dm_parent, obj, inner_material_index, num_cuts, fractal,
-		                       num_levels, smooth, parent_id, i, tempresults, dm_p, uv_layer, solver, thresh, fac);
+		                       num_levels, smooth, parent_id, i, tempresults, dm_p, uv_layer, thresh, fac);
 	}
 	else if (algorithm == MOD_FRACTURE_BISECT || algorithm == MOD_FRACTURE_BISECT_FILL) {
 		float co[3] = {0, 0, 0}, quat[4] =  {1, 0, 0, 0};
@@ -1073,7 +1073,7 @@ static void do_prepare_cells(FracMesh *fm, cell *cells, int expected_shards, int
 //static ThreadMutex prep_lock = BLI_MUTEX_INITIALIZER;
 static void parse_cells(cell *cells, int expected_shards, ShardID parent_id, FracMesh *fm, int algorithm, Object *obj, DerivedMesh *dm,
                         short inner_material_index, float mat[4][4], int num_cuts, float fractal, bool smooth, int num_levels, int mode,
-                        bool reset, int active_setting, int num_settings, char uv_layer[64], bool threaded, int solver, float thresh, int override_count,
+                        bool reset, int active_setting, int num_settings, char uv_layer[64], bool threaded, float thresh, int override_count,
                         float factor)
 {
 	/*Parse voronoi raw data*/
@@ -1218,7 +1218,7 @@ static void parse_cells(cell *cells, int expected_shards, S

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list