[Bf-blender-cvs] [2bcb1b2] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto
noreply at git.blender.org
Wed Nov 16 17:05:22 CET 2016
Commit: 2bcb1b208a4193fb28f1e0c4408b733f5ee2c028
Author: Dalai Felinto
Date: Wed Nov 16 17:01:19 2016 +0100
Branches: blender2.8
https://developer.blender.org/rB2bcb1b208a4193fb28f1e0c4408b733f5ee2c028
Merge remote-tracking branch 'origin/master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library.c
index 83549ae,3411eae..1c63062
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1197,40 -1216,41 +1200,41 @@@ void BKE_main_free(Main *mainvar
/* errors freeing ID's can be hard to track down,
* enable this so valgrind will give the line number in its error log */
switch (a) {
- case 0: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 1: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 2: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 3: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 4: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 5: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 6: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 7: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 8: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 9: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 10: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 11: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 12: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 13: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 14: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 15: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 16: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 17: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 18: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 19: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 20: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 21: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 22: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 23: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 24: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 25: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 26: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 27: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 28: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 29: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 30: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 31: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 32: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 33: BKE_libblock_free_ex(mainvar, id, false, false); break;
- case 34: BKE_libblock_free_ex(mainvar, id, false, false); break;
+ case 0: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 1: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 2: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 3: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 4: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 5: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 6: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 7: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 8: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 9: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 10: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 11: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 12: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 13: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 14: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 15: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 16: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 17: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 18: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 19: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 20: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 21: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 22: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 23: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 24: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 25: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 26: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 27: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 28: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 29: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 30: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 31: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 32: BKE_libblock_free_ex(mainvar, id, false); break;
+ case 33: BKE_libblock_free_ex(mainvar, id, false); break;
++ case 34: BKE_libblock_free_ex(mainvar, id, false); break;
default:
BLI_assert(0);
break;
diff --cc source/blender/blenloader/intern/versioning_270.c
index 529233c,8133d04..577c278
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1339,41 -1427,43 +1339,54 @@@ void blo_do_versions_270(FileData *fd,
}
}
+ if (!MAIN_VERSION_ATLEAST(main, 278, 3)) {
- for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
- if (scene->toolsettings != NULL) {
- ToolSettings *ts = scene->toolsettings;
- ParticleEditSettings *pset = &ts->particle;
- for (int a = 0; a < PE_TOT_BRUSH; a++) {
- if (pset->brush[a].count == 0) {
- pset->brush[a].count = 10;
- }
- }
- }
- }
-
+ if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) {
+ Object *ob;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ RigidBodyCon *rbc = ob->rigidbody_constraint;
+ if (rbc) {
+ rbc->spring_stiffness_ang_x = 10.0;
+ rbc->spring_stiffness_ang_y = 10.0;
+ rbc->spring_stiffness_ang_z = 10.0;
+ rbc->spring_damping_ang_x = 0.5;
+ rbc->spring_damping_ang_y = 0.5;
+ rbc->spring_damping_ang_z = 0.5;
+ }
+ }
+ }
+
+ /* constant detail for sculpting is now a resolution value instead of
+ * a percentage, we reuse old DNA struct member but convert it */
+ for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ if (scene->toolsettings != NULL) {
+ ToolSettings *ts = scene->toolsettings;
+ if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) {
+ ts->sculpt->constant_detail = 100.0f / ts->sculpt->constant_detail;
+ }
+ }
+ }
+ }
++
+ {
+ if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
+ bScreen *screen;
+
+ for (screen = main->screen.first; screen; screen = screen->id.next) {
+ ScrArea *sa;
+ for (sa = screen->areabase.first; sa; sa = sa->next) {
+ SpaceLink *sl;
+
+ for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ switch (sl->spacetype) {
+ case SPACE_VIEW3D:
+ {
+ View3D *v3d = (View3D *)sl;
+ v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
+ }
+ }
+ }
+ }
+ }
+ }
-
- if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) {
- Object *ob;
- for (ob = main->object.first; ob; ob = ob->id.next) {
- RigidBodyCon *rbc = ob->rigidbody_constraint;
- if (rbc) {
- rbc->spring_stiffness_ang_x = 10.0;
- rbc->spring_stiffness_ang_y = 10.0;
- rbc->spring_stiffness_ang_z = 10.0;
- rbc->spring_damping_ang_x = 0.5;
- rbc->spring_damping_ang_y = 0.5;
- rbc->spring_damping_ang_z = 0.5;
- }
- }
- }
+ }
}
diff --cc source/blender/depsgraph/intern/depsgraph_build.cc
index e139ff1,9952f71..171cd45
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@@ -342,18 -350,39 +350,30 @@@ void DEG_add_collision_relations(DepsNo
MEM_freeN(collobjs);
}
- void DEG_add_forcefield_relations(DepsNodeHandle *handle, Scene *scene, Object *ob, EffectorWeights *effector_weights, bool add_absorption, int skip_forcefield, const char *name)
+ void DEG_add_forcefield_relations(DepsNodeHandle *handle,
+ Scene *scene,
+ Object *ob,
+ EffectorWeights *effector_weights,
+ bool add_absorption,
+ int skip_forcefield,
+ const char *name)
{
- ListBase *effectors = pdInitEffectors(scene, ob, NULL, effector_weights, false);
+ ListBase *effectors = pdInitEffectors(scene, ob, effector_weights, false);
if (effectors) {
for (EffectorCache *eff = (EffectorCache*)effectors->first; eff; eff = eff->next) {
if (eff->ob != ob && eff->pd->forcefield != skip_forcefield) {
DEG_add_object_relation(handle, eff->ob, DEG_OB_COMP_TRANSFORM, name);
- if (eff->psys) {
- DEG_add_object_relation(handle, eff->ob, DEG_OB_COMP_EVAL_PARTICLES, name);
-
- /* TODO: remove this when/if EVAL_PARTICLES is sufficient
- * for up to date particles.
- */
- DEG_add_object_relation(handle, eff->ob, DEG_OB_COMP_GEOMETRY, name);
- }
-
if (eff->pd->forcefield == PFIELD_SMOKEFLOW && eff->pd->f_source) {
- DEG_add_object_relation(handle, eff->pd->f_source, DEG_OB_COMP_TRANSFORM, "Smoke Force Domain");
- DEG_add_object_relation(handle, eff->pd->f_source, DEG_OB_COMP_GEOMETRY, "Smoke Force Domain");
+ DEG_add_object_relation(handle,
+ eff->pd->f_source,
+ DEG_OB_COMP_TRANSFORM,
+ "Smoke Force Domain");
+ DEG_add_object_relation(handle,
+ eff->pd->f_so
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list