2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2009-08-19 12:35:40 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
2018-06-01 18:19:39 +02:00
|
|
|
* of the License, or (at your option) any later version.
|
2009-08-19 12:35:40 +00:00
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-08-19 12:35:40 +00:00
|
|
|
*
|
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
|
*
|
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
*/
|
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/space_info/info_stats.c
|
|
|
|
|
* \ingroup spinfo
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2009-08-19 12:35:40 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
|
|
#include "DNA_armature_types.h"
|
|
|
|
|
#include "DNA_curve_types.h"
|
|
|
|
|
#include "DNA_group_types.h"
|
|
|
|
|
#include "DNA_lattice_types.h"
|
|
|
|
|
#include "DNA_meta_types.h"
|
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
#include "BLI_listbase.h"
|
2012-12-27 03:51:45 +00:00
|
|
|
#include "BLI_math.h"
|
2013-03-12 13:18:39 +00:00
|
|
|
#include "BLI_string.h"
|
|
|
|
|
#include "BLI_utildefines.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2013-02-12 07:32:17 +00:00
|
|
|
|
2009-08-19 12:35:40 +00:00
|
|
|
#include "BKE_anim.h"
|
2016-04-24 22:42:41 +10:00
|
|
|
#include "BKE_blender_version.h"
|
2011-09-14 00:37:27 +00:00
|
|
|
#include "BKE_curve.h"
|
2009-08-19 12:35:40 +00:00
|
|
|
#include "BKE_displist.h"
|
|
|
|
|
#include "BKE_DerivedMesh.h"
|
|
|
|
|
#include "BKE_key.h"
|
2017-05-16 11:23:14 +02:00
|
|
|
#include "BKE_layer.h"
|
2012-12-30 18:29:25 +00:00
|
|
|
#include "BKE_paint.h"
|
2016-12-28 17:30:58 +01:00
|
|
|
#include "BKE_particle.h"
|
2013-04-13 20:31:52 +00:00
|
|
|
#include "BKE_editmesh.h"
|
2018-02-13 20:35:29 +11:00
|
|
|
#include "BKE_object.h"
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2011-02-14 17:55:27 +00:00
|
|
|
#include "ED_info.h"
|
2009-08-19 12:35:40 +00:00
|
|
|
#include "ED_armature.h"
|
|
|
|
|
|
2015-04-24 14:11:05 +02:00
|
|
|
#include "GPU_extensions.h"
|
|
|
|
|
|
2013-03-12 13:18:39 +00:00
|
|
|
#define MAX_INFO_LEN 512
|
2014-07-17 14:54:12 +10:00
|
|
|
#define MAX_INFO_NUM_LEN 16
|
2009-08-19 12:35:40 +00:00
|
|
|
|
|
|
|
|
typedef struct SceneStats {
|
|
|
|
|
int totvert, totvertsel;
|
|
|
|
|
int totedge, totedgesel;
|
|
|
|
|
int totface, totfacesel;
|
|
|
|
|
int totbone, totbonesel;
|
2012-04-30 18:37:34 +00:00
|
|
|
int totobj, totobjsel;
|
2018-06-04 09:31:30 +02:00
|
|
|
int totlamp, totlampsel;
|
2014-07-17 14:54:12 +10:00
|
|
|
int tottri;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2013-03-12 13:18:39 +00:00
|
|
|
char infostr[MAX_INFO_LEN];
|
2009-08-19 12:35:40 +00:00
|
|
|
} SceneStats;
|
|
|
|
|
|
2014-07-17 14:54:12 +10:00
|
|
|
typedef struct SceneStatsFmt {
|
|
|
|
|
/* Totals */
|
|
|
|
|
char totvert[MAX_INFO_NUM_LEN], totvertsel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char totface[MAX_INFO_NUM_LEN], totfacesel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char totedge[MAX_INFO_NUM_LEN], totedgesel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char totbone[MAX_INFO_NUM_LEN], totbonesel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char totobj[MAX_INFO_NUM_LEN], totobjsel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char totlamp[MAX_INFO_NUM_LEN], totlampsel[MAX_INFO_NUM_LEN];
|
|
|
|
|
char tottri[MAX_INFO_NUM_LEN];
|
|
|
|
|
} SceneStatsFmt;
|
|
|
|
|
|
2009-08-19 12:35:40 +00:00
|
|
|
static void stats_object(Object *ob, int sel, int totob, SceneStats *stats)
|
|
|
|
|
{
|
2012-03-28 11:53:18 +00:00
|
|
|
switch (ob->type) {
|
2012-09-08 08:59:47 +00:00
|
|
|
case OB_MESH:
|
|
|
|
|
{
|
2012-03-28 11:53:18 +00:00
|
|
|
/* we assume derivedmesh is already built, this strictly does stats now. */
|
|
|
|
|
DerivedMesh *dm = ob->derivedFinal;
|
2012-12-27 03:51:45 +00:00
|
|
|
int totvert, totedge, totface, totloop;
|
2012-03-28 11:53:18 +00:00
|
|
|
|
|
|
|
|
if (dm) {
|
|
|
|
|
totvert = dm->getNumVerts(dm);
|
|
|
|
|
totedge = dm->getNumEdges(dm);
|
|
|
|
|
totface = dm->getNumPolys(dm);
|
2012-12-27 03:51:45 +00:00
|
|
|
totloop = dm->getNumLoops(dm);
|
2012-03-28 11:53:18 +00:00
|
|
|
|
|
|
|
|
stats->totvert += totvert * totob;
|
|
|
|
|
stats->totedge += totedge * totob;
|
|
|
|
|
stats->totface += totface * totob;
|
2012-12-27 03:51:45 +00:00
|
|
|
stats->tottri += poly_to_tri_count(totface, totloop) * totob;
|
2012-03-28 11:53:18 +00:00
|
|
|
|
|
|
|
|
if (sel) {
|
|
|
|
|
stats->totvertsel += totvert;
|
|
|
|
|
stats->totfacesel += totface;
|
|
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
break;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
case OB_LAMP:
|
|
|
|
|
stats->totlamp += totob;
|
2012-04-30 18:37:34 +00:00
|
|
|
if (sel) {
|
|
|
|
|
stats->totlampsel += totob;
|
|
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
break;
|
|
|
|
|
case OB_SURF:
|
|
|
|
|
case OB_CURVE:
|
2012-09-08 08:59:47 +00:00
|
|
|
case OB_FONT:
|
|
|
|
|
case OB_MBALL:
|
|
|
|
|
{
|
2012-12-27 03:51:45 +00:00
|
|
|
int totv = 0, totf = 0, tottri = 0;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2013-08-19 09:25:24 +00:00
|
|
|
if (ob->curve_cache && ob->curve_cache->disp.first)
|
|
|
|
|
BKE_displist_count(&ob->curve_cache->disp, &totv, &totf, &tottri);
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-12-27 03:51:45 +00:00
|
|
|
totv *= totob;
|
|
|
|
|
totf *= totob;
|
|
|
|
|
tottri *= totob;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-12-27 03:51:45 +00:00
|
|
|
stats->totvert += totv;
|
2012-03-28 11:53:18 +00:00
|
|
|
stats->totface += totf;
|
2012-12-27 03:51:45 +00:00
|
|
|
stats->tottri += tottri;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
if (sel) {
|
2012-12-27 03:51:45 +00:00
|
|
|
stats->totvertsel += totv;
|
2012-03-28 11:53:18 +00:00
|
|
|
stats->totfacesel += totf;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void stats_object_edit(Object *obedit, SceneStats *stats)
|
|
|
|
|
{
|
2012-03-28 11:53:18 +00:00
|
|
|
if (obedit->type == OB_MESH) {
|
2013-04-16 05:59:48 +00:00
|
|
|
BMEditMesh *em = BKE_editmesh_from_object(obedit);
|
2009-08-27 08:54:33 +00:00
|
|
|
|
|
|
|
|
stats->totvert = em->bm->totvert;
|
|
|
|
|
stats->totvertsel = em->bm->totvertsel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-27 08:54:33 +00:00
|
|
|
stats->totedge = em->bm->totedge;
|
|
|
|
|
stats->totedgesel = em->bm->totedgesel;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2009-08-27 08:54:33 +00:00
|
|
|
stats->totface = em->bm->totface;
|
|
|
|
|
stats->totfacesel = em->bm->totfacesel;
|
2012-04-30 18:37:34 +00:00
|
|
|
|
|
|
|
|
stats->tottri = em->tottri;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
else if (obedit->type == OB_ARMATURE) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Armature Edit */
|
2012-03-28 11:53:18 +00:00
|
|
|
bArmature *arm = obedit->data;
|
2009-08-19 12:35:40 +00:00
|
|
|
EditBone *ebo;
|
|
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totbone++;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if ((ebo->flag & BONE_CONNECTED) && ebo->parent)
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvert--;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ebo->flag & BONE_TIPSEL)
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvertsel++;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ebo->flag & BONE_ROOTSEL)
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvertsel++;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ebo->flag & BONE_SELECTED) stats->totbonesel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
|
|
|
|
/* if this is a connected child and it's parent is being moved, remove our root */
|
2013-02-12 07:32:17 +00:00
|
|
|
if ((ebo->flag & BONE_CONNECTED) && (ebo->flag & BONE_ROOTSEL) &&
|
|
|
|
|
ebo->parent && (ebo->parent->flag & BONE_TIPSEL))
|
|
|
|
|
{
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvertsel--;
|
2013-02-12 07:32:17 +00:00
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
stats->totvert += 2;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-03-25 22:35:18 +00:00
|
|
|
else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { /* OB_FONT has no cu->editnurb */
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Curve Edit */
|
2012-03-28 11:53:18 +00:00
|
|
|
Curve *cu = obedit->data;
|
2009-08-19 12:35:40 +00:00
|
|
|
Nurb *nu;
|
|
|
|
|
BezTriple *bezt;
|
|
|
|
|
BPoint *bp;
|
|
|
|
|
int a;
|
2012-04-28 16:49:00 +00:00
|
|
|
ListBase *nurbs = BKE_curve_editNurbs_get(cu);
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
for (nu = nurbs->first; nu; nu = nu->next) {
|
2012-03-24 06:38:07 +00:00
|
|
|
if (nu->type == CU_BEZIER) {
|
2012-03-28 11:53:18 +00:00
|
|
|
bezt = nu->bezt;
|
|
|
|
|
a = nu->pntsu;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
2012-03-28 11:53:18 +00:00
|
|
|
stats->totvert += 3;
|
2013-10-01 12:35:43 +00:00
|
|
|
if (bezt->f1 & SELECT) stats->totvertsel++;
|
|
|
|
|
if (bezt->f2 & SELECT) stats->totvertsel++;
|
|
|
|
|
if (bezt->f3 & SELECT) stats->totvertsel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
bezt++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2012-03-28 11:53:18 +00:00
|
|
|
bp = nu->bp;
|
|
|
|
|
a = nu->pntsu * nu->pntsv;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvert++;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bp->f1 & SELECT) stats->totvertsel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
bp++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
else if (obedit->type == OB_MBALL) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* MetaBall Edit */
|
2012-03-28 11:53:18 +00:00
|
|
|
MetaBall *mball = obedit->data;
|
2009-08-19 12:35:40 +00:00
|
|
|
MetaElem *ml;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
for (ml = mball->editelems->first; ml; ml = ml->next) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvert++;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ml->flag & SELECT) stats->totvertsel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
2012-03-28 11:53:18 +00:00
|
|
|
else if (obedit->type == OB_LATTICE) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Lattice Edit */
|
2012-03-28 11:53:18 +00:00
|
|
|
Lattice *lt = obedit->data;
|
|
|
|
|
Lattice *editlatt = lt->editlatt->latt;
|
2009-08-19 12:35:40 +00:00
|
|
|
BPoint *bp;
|
|
|
|
|
int a;
|
|
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
bp = editlatt->def;
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
a = editlatt->pntsu * editlatt->pntsv * editlatt->pntsw;
|
2012-03-24 06:38:07 +00:00
|
|
|
while (a--) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totvert++;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (bp->f1 & SELECT) stats->totvertsel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
bp++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void stats_object_pose(Object *ob, SceneStats *stats)
|
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob->pose) {
|
2012-03-28 11:53:18 +00:00
|
|
|
bArmature *arm = ob->data;
|
2009-08-19 12:35:40 +00:00
|
|
|
bPoseChannel *pchan;
|
|
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totbone++;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (pchan->bone && (pchan->bone->flag & BONE_SELECTED))
|
|
|
|
|
if (pchan->bone->layer & arm->layer)
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totbonesel++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-30 18:29:25 +00:00
|
|
|
static void stats_object_sculpt_dynamic_topology(Object *ob, SceneStats *stats)
|
|
|
|
|
{
|
|
|
|
|
stats->totvert = ob->sculpt->bm->totvert;
|
|
|
|
|
stats->tottri = ob->sculpt->bm->totface;
|
|
|
|
|
}
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
static void stats_dupli_object_group_count(Collection *collection, int *count)
|
2017-12-01 11:24:21 -02:00
|
|
|
{
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
*count += BLI_listbase_count(&collection->gobject);
|
2017-12-01 11:24:21 -02:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
for (CollectionChild *child = collection->children.first; child; child = child->next) {
|
|
|
|
|
stats_dupli_object_group_count(child->collection, count);
|
2017-12-01 11:24:21 -02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
static void stats_dupli_object_group_doit(Collection *collection, SceneStats *stats, ParticleSystem *psys,
|
2017-12-01 11:24:21 -02:00
|
|
|
const int totgroup, int *cur)
|
|
|
|
|
{
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
|
2017-12-01 11:24:21 -02:00
|
|
|
int tot = count_particles_mod(psys, totgroup, *cur);
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
stats_object(cob->ob, 0, tot, stats);
|
2017-12-01 11:24:21 -02:00
|
|
|
(*cur)++;
|
|
|
|
|
}
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
for (CollectionChild *child = collection->children.first; child; child = child->next) {
|
|
|
|
|
stats_dupli_object_group_doit(child->collection, stats, psys, totgroup, cur);
|
2017-12-01 11:24:21 -02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-16 11:23:14 +02:00
|
|
|
static void stats_dupli_object(Base *base, Object *ob, SceneStats *stats)
|
2009-08-19 12:35:40 +00:00
|
|
|
{
|
2017-05-16 11:23:14 +02:00
|
|
|
if (base->flag & BASE_SELECTED) stats->totobjsel++;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2016-12-28 17:30:58 +01:00
|
|
|
if (ob->transflag & OB_DUPLIPARTS) {
|
|
|
|
|
/* Dupli Particles */
|
|
|
|
|
ParticleSystem *psys;
|
|
|
|
|
ParticleSettings *part;
|
|
|
|
|
|
|
|
|
|
for (psys = ob->particlesystem.first; psys; psys = psys->next) {
|
|
|
|
|
part = psys->part;
|
|
|
|
|
|
|
|
|
|
if (part->draw_as == PART_DRAW_OB && part->dup_ob) {
|
|
|
|
|
int tot = count_particles(psys);
|
|
|
|
|
stats_object(part->dup_ob, 0, tot, stats);
|
|
|
|
|
}
|
|
|
|
|
else if (part->draw_as == PART_DRAW_GR && part->dup_group) {
|
2017-12-01 11:24:21 -02:00
|
|
|
int totgroup = 0, cur = 0;
|
|
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
Collection *collection = part->dup_group;
|
|
|
|
|
stats_dupli_object_group_count(collection, &totgroup);
|
|
|
|
|
stats_dupli_object_group_doit(collection, stats, psys, totgroup, &cur);
|
2016-12-28 17:30:58 +01:00
|
|
|
}
|
|
|
|
|
}
|
2018-06-04 09:31:30 +02:00
|
|
|
|
2017-10-17 19:50:26 -02:00
|
|
|
stats_object(ob, base->flag & BASE_SELECTED, 1, stats);
|
2016-12-28 17:30:58 +01:00
|
|
|
stats->totobj++;
|
|
|
|
|
}
|
|
|
|
|
else if (ob->parent && (ob->parent->transflag & (OB_DUPLIVERTS | OB_DUPLIFACES))) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Dupli Verts/Faces */
|
2013-12-10 00:23:53 +11:00
|
|
|
int tot;
|
|
|
|
|
|
|
|
|
|
/* metaball dupli-instances are tessellated once */
|
|
|
|
|
if (ob->type == OB_MBALL) {
|
|
|
|
|
tot = 1;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
tot = count_duplilist(ob->parent);
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
stats->totobj += tot;
|
2017-10-17 19:50:26 -02:00
|
|
|
stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
else if (ob->transflag & OB_DUPLIFRAMES) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Dupli Frames */
|
2012-03-28 11:53:18 +00:00
|
|
|
int tot = count_duplilist(ob);
|
|
|
|
|
stats->totobj += tot;
|
2017-10-17 19:50:26 -02:00
|
|
|
stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
else if ((ob->transflag & OB_DUPLICOLLECTION) && ob->dup_group) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Dupli Group */
|
2012-03-28 11:53:18 +00:00
|
|
|
int tot = count_duplilist(ob);
|
|
|
|
|
stats->totobj += tot;
|
2017-10-17 19:50:26 -02:00
|
|
|
stats_object(ob, base->flag & BASE_SELECTED, tot, stats);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
/* No Dupli */
|
2017-10-17 19:50:26 -02:00
|
|
|
stats_object(ob, base->flag & BASE_SELECTED, 1, stats);
|
2009-08-19 12:35:40 +00:00
|
|
|
stats->totobj++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-06 23:27:49 +11:00
|
|
|
static bool stats_is_object_dynamic_topology_sculpt(Object *ob, const eObjectMode object_mode)
|
2012-12-30 18:29:25 +00:00
|
|
|
{
|
2018-02-06 17:32:00 +11:00
|
|
|
return (ob &&
|
|
|
|
|
(object_mode & OB_MODE_SCULPT) &&
|
2012-12-31 02:37:28 +00:00
|
|
|
ob->sculpt && ob->sculpt->bm);
|
2012-12-30 18:29:25 +00:00
|
|
|
}
|
|
|
|
|
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Statistics displayed in info header. Called regularly on scene changes. */
|
2018-04-05 18:20:27 +02:00
|
|
|
static void stats_update(ViewLayer *view_layer)
|
2009-08-19 12:35:40 +00:00
|
|
|
{
|
2012-03-28 11:53:18 +00:00
|
|
|
SceneStats stats = {0};
|
2018-04-05 18:20:27 +02:00
|
|
|
Object *ob = OBACT(view_layer);
|
|
|
|
|
Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
|
2017-05-16 11:23:14 +02:00
|
|
|
Base *base;
|
2018-02-13 20:35:29 +11:00
|
|
|
|
|
|
|
|
if (obedit) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Edit Mode */
|
2018-02-13 20:35:29 +11:00
|
|
|
stats_object_edit(ob, &stats);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2018-04-05 18:20:27 +02:00
|
|
|
else if (ob && (ob->mode & OB_MODE_POSE)) {
|
2009-08-19 12:35:40 +00:00
|
|
|
/* Pose Mode */
|
|
|
|
|
stats_object_pose(ob, &stats);
|
|
|
|
|
}
|
2018-04-09 21:59:54 -04:00
|
|
|
else if (ob && stats_is_object_dynamic_topology_sculpt(ob, ob->mode)) {
|
2012-12-30 18:29:25 +00:00
|
|
|
/* Dynamic-topology sculpt mode */
|
|
|
|
|
stats_object_sculpt_dynamic_topology(ob, &stats);
|
|
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
else {
|
|
|
|
|
/* Objects */
|
2017-11-23 13:51:49 -02:00
|
|
|
for (base = view_layer->object_bases.first; base; base = base->next)
|
2017-05-16 11:23:14 +02:00
|
|
|
if (base->flag & BASE_VISIBLED) {
|
2009-08-19 12:35:40 +00:00
|
|
|
stats_dupli_object(base, base->object, &stats);
|
2017-05-16 11:23:14 +02:00
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
2017-11-23 13:51:49 -02:00
|
|
|
if (!view_layer->stats) {
|
|
|
|
|
view_layer->stats = MEM_callocN(sizeof(SceneStats), "SceneStats");
|
2017-05-16 11:23:14 +02:00
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2017-11-23 13:51:49 -02:00
|
|
|
*(view_layer->stats) = stats;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
2018-04-05 18:20:27 +02:00
|
|
|
static void stats_string(ViewLayer *view_layer)
|
2009-08-19 12:35:40 +00:00
|
|
|
{
|
2013-03-12 13:18:39 +00:00
|
|
|
#define MAX_INFO_MEM_LEN 64
|
2017-11-23 13:51:49 -02:00
|
|
|
SceneStats *stats = view_layer->stats;
|
2014-07-17 14:54:12 +10:00
|
|
|
SceneStatsFmt stats_fmt;
|
2018-04-05 18:20:27 +02:00
|
|
|
Object *ob = OBACT(view_layer);
|
|
|
|
|
Object *obedit = OBEDIT_FROM_OBACT(ob);
|
|
|
|
|
eObjectMode object_mode = ob ? ob->mode : OB_MODE_OBJECT;
|
2009-08-19 12:35:40 +00:00
|
|
|
uintptr_t mem_in_use, mmap_in_use;
|
2013-03-12 13:18:39 +00:00
|
|
|
char memstr[MAX_INFO_MEM_LEN];
|
2015-04-24 14:11:05 +02:00
|
|
|
char gpumemstr[MAX_INFO_MEM_LEN] = "";
|
2018-05-25 22:17:15 +02:00
|
|
|
char formatted_mem[15];
|
2009-08-19 12:35:40 +00:00
|
|
|
char *s;
|
2013-03-12 13:18:39 +00:00
|
|
|
size_t ofs = 0;
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
mem_in_use = MEM_get_memory_in_use();
|
|
|
|
|
mmap_in_use = MEM_get_mapped_memory_in_use();
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2014-07-17 14:54:12 +10:00
|
|
|
|
|
|
|
|
/* Generate formatted numbers */
|
|
|
|
|
#define SCENE_STATS_FMT_INT(_id) \
|
|
|
|
|
BLI_str_format_int_grouped(stats_fmt._id, stats->_id)
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totvert);
|
|
|
|
|
SCENE_STATS_FMT_INT(totvertsel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totedge);
|
|
|
|
|
SCENE_STATS_FMT_INT(totedgesel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totface);
|
|
|
|
|
SCENE_STATS_FMT_INT(totfacesel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totbone);
|
|
|
|
|
SCENE_STATS_FMT_INT(totbonesel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totobj);
|
|
|
|
|
SCENE_STATS_FMT_INT(totobjsel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(totlamp);
|
|
|
|
|
SCENE_STATS_FMT_INT(totlampsel);
|
|
|
|
|
|
|
|
|
|
SCENE_STATS_FMT_INT(tottri);
|
|
|
|
|
|
|
|
|
|
#undef SCENE_STATS_FMT_INT
|
|
|
|
|
|
|
|
|
|
|
2009-08-19 12:35:40 +00:00
|
|
|
/* get memory statistics */
|
2018-05-25 22:17:15 +02:00
|
|
|
BLI_str_format_byte_unit(formatted_mem, mem_in_use - mmap_in_use, true);
|
|
|
|
|
ofs = BLI_snprintf(memstr, MAX_INFO_MEM_LEN, IFACE_(" | Mem: %s"), formatted_mem);
|
|
|
|
|
|
|
|
|
|
if (mmap_in_use) {
|
|
|
|
|
BLI_str_format_byte_unit(formatted_mem, mmap_in_use, true);
|
|
|
|
|
BLI_snprintf(memstr + ofs, MAX_INFO_MEM_LEN - ofs, IFACE_(" (%s)"), formatted_mem);
|
|
|
|
|
}
|
2015-04-24 14:11:05 +02:00
|
|
|
|
|
|
|
|
if (GPU_mem_stats_supported()) {
|
|
|
|
|
int gpu_free_mem, gpu_tot_memory;
|
|
|
|
|
|
|
|
|
|
GPU_mem_stats_get(&gpu_tot_memory, &gpu_free_mem);
|
|
|
|
|
|
2018-05-25 22:17:15 +02:00
|
|
|
BLI_str_format_byte_unit(formatted_mem, gpu_free_mem, true);
|
|
|
|
|
ofs = BLI_snprintf(gpumemstr, MAX_INFO_MEM_LEN, IFACE_(" | Free GPU Mem: %s"), formatted_mem);
|
2015-04-24 14:11:05 +02:00
|
|
|
|
|
|
|
|
if (gpu_tot_memory) {
|
2018-05-25 22:17:15 +02:00
|
|
|
BLI_str_format_byte_unit(formatted_mem, gpu_tot_memory, true);
|
|
|
|
|
BLI_snprintf(gpumemstr + ofs, MAX_INFO_MEM_LEN - ofs, IFACE_("/%s"), formatted_mem);
|
2015-04-24 14:11:05 +02:00
|
|
|
}
|
|
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2012-03-28 11:53:18 +00:00
|
|
|
s = stats->infostr;
|
2013-03-12 13:18:39 +00:00
|
|
|
ofs = 0;
|
|
|
|
|
|
|
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, "%s | ", versionstr);
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2018-02-13 20:35:29 +11:00
|
|
|
if (obedit) {
|
|
|
|
|
if (BKE_keyblock_from_object(obedit))
|
2013-03-14 10:39:18 +00:00
|
|
|
ofs += BLI_strncpy_rlen(s + ofs, IFACE_("(Key) "), MAX_INFO_LEN - ofs);
|
2009-08-19 12:35:40 +00:00
|
|
|
|
2018-02-13 20:35:29 +11:00
|
|
|
if (obedit->type == OB_MESH) {
|
2013-03-12 13:18:39 +00:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs,
|
2014-07-17 14:54:12 +10:00
|
|
|
IFACE_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"),
|
|
|
|
|
stats_fmt.totvertsel, stats_fmt.totvert, stats_fmt.totedgesel, stats_fmt.totedge,
|
|
|
|
|
stats_fmt.totfacesel, stats_fmt.totface, stats_fmt.tottri);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2018-02-13 20:35:29 +11:00
|
|
|
else if (obedit->type == OB_ARMATURE) {
|
2014-07-17 14:54:12 +10:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%s/%s | Bones:%s/%s"), stats_fmt.totvertsel,
|
|
|
|
|
stats_fmt.totvert, stats_fmt.totbonesel, stats_fmt.totbone);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
else {
|
2014-07-17 14:54:12 +10:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%s/%s"), stats_fmt.totvertsel,
|
|
|
|
|
stats_fmt.totvert);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
2013-03-14 10:39:18 +00:00
|
|
|
ofs += BLI_strncpy_rlen(s + ofs, memstr, MAX_INFO_LEN - ofs);
|
2015-04-24 14:11:05 +02:00
|
|
|
ofs += BLI_strncpy_rlen(s + ofs, gpumemstr, MAX_INFO_LEN - ofs);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2018-02-06 17:32:00 +11:00
|
|
|
else if (ob && (object_mode & OB_MODE_POSE)) {
|
2015-04-24 14:11:05 +02:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Bones:%s/%s %s%s"),
|
|
|
|
|
stats_fmt.totbonesel, stats_fmt.totbone, memstr, gpumemstr);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
2018-02-06 17:32:00 +11:00
|
|
|
else if (stats_is_object_dynamic_topology_sculpt(ob, object_mode)) {
|
2015-04-24 14:11:05 +02:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, IFACE_("Verts:%s | Tris:%s%s"), stats_fmt.totvert,
|
|
|
|
|
stats_fmt.tottri, gpumemstr);
|
2012-12-30 18:29:25 +00:00
|
|
|
}
|
2009-08-19 12:35:40 +00:00
|
|
|
else {
|
2013-03-12 13:18:39 +00:00
|
|
|
ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs,
|
2015-04-24 14:11:05 +02:00
|
|
|
IFACE_("Verts:%s | Faces:%s | Tris:%s | Objects:%s/%s | Lamps:%s/%s%s%s"),
|
2014-07-17 14:54:12 +10:00
|
|
|
stats_fmt.totvert, stats_fmt.totface,
|
|
|
|
|
stats_fmt.tottri, stats_fmt.totobjsel,
|
|
|
|
|
stats_fmt.totobj, stats_fmt.totlampsel,
|
2015-04-24 14:11:05 +02:00
|
|
|
stats_fmt.totlamp, memstr, gpumemstr);
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (ob)
|
2013-03-12 13:18:39 +00:00
|
|
|
BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, " | %s", ob->id.name + 2);
|
|
|
|
|
#undef MAX_INFO_MEM_LEN
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
2013-03-12 13:18:39 +00:00
|
|
|
#undef MAX_INFO_LEN
|
|
|
|
|
|
2017-11-23 13:51:49 -02:00
|
|
|
void ED_info_stats_clear(ViewLayer *view_layer)
|
2009-08-19 12:35:40 +00:00
|
|
|
{
|
2017-11-23 13:51:49 -02:00
|
|
|
if (view_layer->stats) {
|
|
|
|
|
MEM_freeN(view_layer->stats);
|
|
|
|
|
view_layer->stats = NULL;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-05 18:20:27 +02:00
|
|
|
const char *ED_info_stats_string(Scene *UNUSED(scene), ViewLayer *view_layer)
|
2009-08-19 12:35:40 +00:00
|
|
|
{
|
2017-11-23 13:51:49 -02:00
|
|
|
if (!view_layer->stats) {
|
2018-04-05 18:20:27 +02:00
|
|
|
stats_update(view_layer);
|
2017-05-16 11:23:14 +02:00
|
|
|
}
|
2018-04-05 18:20:27 +02:00
|
|
|
stats_string(view_layer);
|
2017-11-23 13:51:49 -02:00
|
|
|
return view_layer->stats->infostr;
|
2009-08-19 12:35:40 +00:00
|
|
|
}
|