Commit: d92985cfc9e040bf6c079f5848974ba76153f827
Author: Lukas Tönne
Date: Mon Nov 24 16:28:24 2014 +0100
Branches: hair_system
https://developer.blender.org/rBd92985cfc9e040bf6c079f5848974ba76153f827
Merge branch 'gooseberry' into hair_system
Conflicts:
source/blender/blenkernel/intern/rigidbody.c
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_curves.cpp
index c81c243,f010a24..8d7dbcc
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@@ -550,8 -554,9 +551,9 @@@ void ExportParticleCurveTriangleGeometr
/* texture coords still needed */
}
-void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
+static void ExportParticleCurveSegments(Scene *scene, Mesh *mesh,
ParticleCurveData *CData)
{
+ VLOG(1) << "Exporting curve segments for mesh " << mesh->name;
int num_keys = 0;
int num_curves = 0;
@@@ -618,8 -623,11 +620,11 @@@
}
}
-static void ExportCurveSegmentsMotion(Scene *scene, Mesh *mesh,
ParticleCurveData *CData, int time_index)
+static void ExportParticleCurveSegmentsMotion(Scene *scene, Mesh *mesh,
ParticleCurveData *CData, int time_index)
{
+ VLOG(1) << "Exporting curve motion segments for mesh " << mesh->name
+ << ", time index " << time_index;
+
/* find attribute */
Attribute *attr_mP =
mesh->curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
bool new_attribute = false;
diff --cc source/blender/blenkernel/intern/rigidbody.c
index 0ea00a9,4b8f60d..2e422f3
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@@ -710,22 -1158,16 +710,22 @@@ static void rigidbody_update_ob_array(R
GroupObject *go;
int i, n;
- n = BLI_listbase_count(&rbw->group->gobject);
-
- if (rbw->numbodies != n) {
- rbw->numbodies = n;
- rbw->objects = realloc(rbw->objects, sizeof(Object *) *
rbw->numbodies);
+ if (rbw->group) {
- n = BLI_countlist(&rbw->group->gobject);
++ n = BLI_listbase_count(&rbw->group->gobject);
+
+ if (rbw->numbodies != n) {
+ rbw->numbodies = n;
+ rbw->objects = realloc(rbw->objects, sizeof(Object *) *
rbw->numbodies);
+ }
+
+ for (go = rbw->group->gobject.first, i = 0; go; go = go->next,
i++) {
+ Object *ob = go->ob;
+ rbw->objects[i] = ob;
+ }
}
-
- for (go = rbw->group->gobject.first, i = 0; go; go = go->next, i++) {
- Object *ob = go->ob;
- rbw->objects[i] = ob;
+ else {
+ rbw->numbodies = 0;
+ rbw->objects = NULL;
}
}
@@@ -835,7 -1499,7 +835,7 @@@ void BKE_rigidbody_rebuild_world(Scene
cache = rbw->pointcache;
/* flag cache as outdated if we don't have a world or number of objects
in the simulation has changed */
- if (rbw->physics_world == NULL || (rbw->group && rbw->numbodies !=
BLI_countlist(&rbw->group->gobject))) {
- if (rbw->physics_world == NULL || rbw->numbodies !=
BLI_listbase_count(&rbw->group->gobject)) {
++ if (rbw->physics_world == NULL || (rbw->group && rbw->numbodies !=
BLI_listbase_count(&rbw->group->gobject))) {
cache->flag |= PTCACHE_OUTDATED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
