Commit: 911fe9dfa27735d18a52c2e1f6c6225d2d944047
Author: Lukas Tönne
Date: Mon Jul 14 14:59:17 2014 +0200
https://developer.blender.org/rB911fe9dfa27735d18a52c2e1f6c6225d2d944047
Fixed a few small merge errors. Sorted libs are now defined in
macros.cmake.
===================================================================
M build_files/cmake/macros.cmake
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index bfd1cf6..ed0e052 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 2046fbd..77636a8 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) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
