Commit: 6806065c386a67bbb697ab72c087a0e18e817dfe
Author: Martin Felke
Date: Tue Mar 28 18:35:27 2017 +0200
Branches: fracture_modifier
https://developer.blender.org/rB6806065c386a67bbb697ab72c087a0e18e817dfe
apparently fixed the cuttergroup bug (was an incorrect bbox test) + silenced 2
warnings
===================================================================
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/modifiers/intern/MOD_fracture.c
===================================================================
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h
b/source/blender/makesdna/DNA_rigidbody_types.h
index d8797834b8f..c9c57deab6e 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -46,7 +46,7 @@ struct EffectorWeights;
*
* Represents a "simulation scene" existing within the parent scene.
*/
-typedef struct RigidBodyOb RigidBodyOb;
+struct RigidBodyOb;
typedef struct RigidBodyWorld {
/* Sim World Settings
------------------------------------------------------------- */
@@ -73,7 +73,7 @@ typedef struct RigidBodyWorld {
/* References to Physics Sim objects. Exist at runtime only
---------------------- */
void *physics_world; /* Physics sim world (i.e.
btDiscreteDynamicsWorld) */
- RigidBodyOb **cache_index_map; /* Maps the linear RigidbodyOb
index to the nested Object(Modifier) Index, at runtime*/
+ struct RigidBodyOb **cache_index_map; /* Maps the linear
RigidbodyOb index to the nested Object(Modifier) Index, at runtime*/
int *cache_offset_map; /* Maps the linear RigidbodyOb index to
the nested Object(Modifier) cell offset, at runtime, so it does not need to be
calced in cache*/
float internal_tick; /* this is the current ? internal
bullet time step, clumsy to put here but cannot expose custom callback
parameters */
char pad2[4];
diff --git a/source/blender/modifiers/intern/MOD_fracture.c
b/source/blender/modifiers/intern/MOD_fracture.c
index 52f642799aa..117e95ab11b 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -206,7 +206,7 @@ static void initData(ModifierData *md)
fmd->meshConstraints.last = NULL;
fmd->fracture_mode = MOD_FRACTURE_PREFRACTURED;
- fmd->last_frame = FLT_MIN;
+ fmd->last_frame = INT_MIN;
fmd->dynamic_force = 10.0f;
fmd->update_dynamic = false;
fmd->limit_impact = false;
@@ -1314,7 +1314,7 @@ static FracPointCloud
get_points_global(FractureModifierData *emd, Object *ob, D
co[1] = min[1] + (max[1] - min[1]) *
BLI_frand();
co[2] = min[2] + (max[2] - min[2]) *
BLI_frand();
- if (id > 0)
+ if (id > 0 && emd->cutter_group == NULL)
{
if (in_bbox(co, bmin, bmax))
{
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
