diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-14 16:59:17 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-14 16:59:17 +0400 |
| commit | 911fe9dfa27735d18a52c2e1f6c6225d2d944047 (patch) | |
| tree | ea5f40f02970afad306c863f27796c64b926d7ca | |
| parent | 55cf7703fd71f79e3f9ae9e523e27ce33396f276 (diff) | |
Fixed a few small merge errors. Sorted libs are now defined in
macros.cmake.
| -rw-r--r-- | build_files/cmake/macros.cmake | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index bfd1cf61df0..ed0e052f194 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -487,6 +487,7 @@ macro(SETUP_BLENDER_SORTED_LIBS) bf_python_ext bf_python_mathutils bf_python_bmesh + bf_python_bparticles bf_freestyle bf_ikplugin bf_modifiers diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 2046fbdc5c2..77636a85947 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -887,7 +887,6 @@ static void rigidbody_world_build_particle_systems(Scene *UNUSED(scene), RigidBo } } -/* Construct Bullet bodies, shapes and constraints from a Blender scene. /** * Updates and validates world, bodies and shapes. * @@ -911,6 +910,7 @@ static void rigidbody_world_build(Scene *scene, RigidBodyWorld *rbw, int rebuild * Memory management needs redesign here, this is just a dirty workaround. */ if (rebuild && rbw->constraints) { + GroupObject *go; for (go = rbw->constraints->gobject.first; go; go = go->next) { Object *ob = go->ob; if (ob) { |