[Bf-blender-cvs] [3db5b76] fracture_modifier: compile fix after merge
Martin Felke
noreply at git.blender.org
Sun Feb 21 20:26:28 CET 2016
Commit: 3db5b7620185ce281a398e6a0b61deed0f959277
Author: Martin Felke
Date: Sun Feb 21 13:27:46 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rB3db5b7620185ce281a398e6a0b61deed0f959277
compile fix after merge
===================================================================
M extern/CMakeLists.txt
M extern/bullet2/CMakeLists.txt
M source/blender/blenlib/BLI_string.h
M source/blender/editors/object/object_modifier.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/modifiers/intern/MOD_fracture.c
===================================================================
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 8157c2e..6b46c65 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -85,6 +85,7 @@ endif()
if(WITH_VORO)
add_subdirectory(voro++)
+endif()
if(WITH_LIBMV)
add_subdirectory(ceres)
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index fe70c89..9d7a972 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -130,6 +130,7 @@ set(SRC
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
src/BulletDynamics/Character/btKinematicCharacterController.cpp
+ src/BulletDynamics/ConstraintSolver/btCompoundConstraint.cpp
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index ab24c70..8278039 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -89,7 +89,7 @@ int BLI_str_index_in_array_n(const char *__restrict str, const char **__restrict
int BLI_str_index_in_array(const char *__restrict str, const char **__restrict str_array) ATTR_NONNULL();
bool BLI_str_endswith(const char *__restrict str, const char *__restrict end) ATTR_NONNULL();
-bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, int length) ATTR_NONNULL();
+bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, size_t length) ATTR_NONNULL();
size_t BLI_str_partition(const char *str, const char delim[], const char **sep, const char **suf) ATTR_NONNULL();
size_t BLI_str_rpartition(const char *str, const char delim[], const char **sep, const char **suf) ATTR_NONNULL();
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 99ff392..f60491e 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -3102,12 +3102,12 @@ static int rigidbody_convert_exec(bContext *C, wmOperator *op)
ED_base_object_free_and_unlink(bmain, scene, bas);
/* delete has to handle all open scenes, copied from delete operator */
- BKE_main_id_flag_listbase(&bmain->scene, LIB_DOIT, 1);
+ BKE_main_id_flag_listbase(&bmain->scene, LIB_TAG_DOIT, 1);
for (win = wm->windows.first; win; win = win->next) {
scene = win->screen->scene;
- if (scene->id.flag & LIB_DOIT) {
- scene->id.flag &= ~LIB_DOIT;
+ if (scene->id.flag & LIB_TAG_DOIT) {
+ scene->id.flag &= ~LIB_TAG_DOIT;
DAG_relations_tag_update(bmain);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 0e8cc64..b0ea81c 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5362,7 +5362,7 @@ static void rna_def_mesh_constraint(BlenderRNA *brna)
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "type");
- RNA_def_property_enum_items(prop, rigidbody_constraint_type_items);
+ RNA_def_property_enum_items(prop, rna_enum_rigidbody_constraint_type_items);
//RNA_def_property_enum_funcs(prop, NULL, "rna_MeshCon_type_set", NULL);
RNA_def_property_ui_text(prop, "Type", "Type of Rigid Body Constraint");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@@ -5745,7 +5745,7 @@ static void rna_def_fracture_meshconstraints(BlenderRNA *brna, PropertyRNA *cpro
RNA_def_property_flag(parm, PROP_REQUIRED);
parm = RNA_def_pointer(func, "mi_second", "MeshIsland", "", "Second mesh island");
RNA_def_property_flag(parm, PROP_REQUIRED);
- parm = RNA_def_enum(func, "type", rigidbody_constraint_type_items, RBC_TYPE_FIXED, "Constraint Type", "Type of constraint");
+ parm = RNA_def_enum(func, "type", rna_enum_rigidbody_constraint_type_items, RBC_TYPE_FIXED, "Constraint Type", "Type of constraint");
RNA_def_property_flag(parm, PROP_REQUIRED);
//RNA_def_int(func, "index", -1, -1, INT_MAX, "Index", "Optional index for mesh constraint, -1 for automatic", -1, INT_MAX);
@@ -6213,7 +6213,7 @@ static void rna_def_modifier_fracture(BlenderRNA *brna)
prop = RNA_def_property(srna, "cluster_constraint_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "cluster_constraint_type");
- RNA_def_property_enum_items(prop, rigidbody_constraint_type_items);
+ RNA_def_property_enum_items(prop, rna_enum_rigidbody_constraint_type_items);
RNA_def_property_enum_funcs(prop, NULL, "rna_FractureModifier_cluster_constraint_type_set", NULL);
RNA_def_property_ui_text(prop, "Cluster Constraint Type", "Type of Rigid Body Constraint between clusters");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 1b4d698..facc6fd 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -337,7 +337,13 @@ static void rna_RigidBodyOb_type_set(PointerRNA *ptr, int value)
foreach_shard_int(ob, value, set_type);
}
+static void rna_RigidBodyOb_shape_set(PointerRNA *ptr, int value)
+{
+ RigidBodyOb *rbo = (RigidBodyOb *)ptr->data;
+ rbo->shape = value;
+ rbo->flag |= RBO_FLAG_NEEDS_VALIDATE;
+}
static void set_disabled(RigidBodyOb* rbo, int value) {
diff --git a/source/blender/modifiers/intern/MOD_fracture.c b/source/blender/modifiers/intern/MOD_fracture.c
index 70408ba..006085c 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -52,6 +52,7 @@
#include "BKE_global.h"
#include "BKE_group.h"
#include "BKE_library.h"
+#include "BKE_library_query.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_modifier.h"
@@ -3597,19 +3598,19 @@ static void foreachIDLink(ModifierData *md, Object *ob,
FractureModifierData *fmd = (FractureModifierData *) md;
FractureSetting *fs;
- walk(userData, ob, (ID **)&fmd->inner_material);
- walk(userData, ob, (ID **)&fmd->extra_group);
- walk(userData, ob, (ID **)&fmd->dm_group);
- walk(userData, ob, (ID **)&fmd->cluster_group);
- walk(userData, ob, (ID **)&fmd->cutter_group);
- walk(userData, ob, (ID **)&fmd->autohide_filter_group);
+ walk(userData, ob, (ID **)&fmd->inner_material, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fmd->extra_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fmd->dm_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fmd->cluster_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fmd->cutter_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fmd->autohide_filter_group, IDWALK_NOP);
for (fs = fmd->fracture_settings.first; fs; fs = fs->next)
{
- walk(userData, ob, (ID **)&fs->inner_material);
- walk(userData, ob, (ID **)&fs->extra_group);
- walk(userData, ob, (ID **)&fs->cluster_group);
- walk(userData, ob, (ID **)&fs->cutter_group);
+ walk(userData, ob, (ID **)&fs->inner_material, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fs->extra_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fs->cluster_group, IDWALK_NOP);
+ walk(userData, ob, (ID **)&fs->cutter_group, IDWALK_NOP);
}
}
More information about the Bf-blender-cvs
mailing list