archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename restrict to hide/visibility in Object, Collection, MaskLayer

Browse Source 
This makes the internal naming consistent with the public API. And also gives
us a visibility_flag rather than restrictflag that can be extended with more
flags.
This commit is contained in:
Brecht Van Lommel
2021-08-04 17:46:55 +02:00
parent 10b9621079
commit 8abf6efcf6
40 changed files with 177 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -648,9 +648,9 @@ void DepsgraphNodeBuilder::build_idproperties(IDProperty *id_property)
void DepsgraphNodeBuilder::build_collection(LayerCollection *from_layer_collection,
Collection *collection)
{
const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_RESTRICT_VIEWPORT :
COLLECTION_RESTRICT_RENDER;
const bool is_collection_restricted = (collection->flag & restrict_flag);
const int visibility_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_HIDE_VIEWPORT :
COLLECTION_HIDE_RENDER;
const bool is_collection_restricted = (collection->flag & visibility_flag);
const bool is_collection_visible = !is_collection_restricted && is_parent_collection_visible_;
IDNode *id_node;
if (built_map_.checkIsBuiltAndTag(collection)) {

6
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
View File

@@ -60,11 +60,11 @@ namespace blender::deg {
void DepsgraphNodeBuilder::build_layer_collections(ListBase *lb)
{
const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_RESTRICT_VIEWPORT :
COLLECTION_RESTRICT_RENDER;
const int visibility_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_HIDE_VIEWPORT :
COLLECTION_HIDE_RENDER;
for (LayerCollection *lc = (LayerCollection *)lb->first; lc; lc = lc->next) {
if (lc->collection->flag & restrict_flag) {
if (lc->collection->flag & visibility_flag) {
continue;
}
if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {

6
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
View File

@@ -61,11 +61,11 @@ namespace blender::deg {
void DepsgraphRelationBuilder::build_layer_collections(ListBase *lb)
{
const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_RESTRICT_VIEWPORT :
COLLECTION_RESTRICT_RENDER;
const int visibility_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_HIDE_VIEWPORT :
COLLECTION_HIDE_RENDER;
for (LayerCollection *lc = (LayerCollection *)lb->first; lc; lc = lc->next) {
if ((lc->collection->flag & restrict_flag)) {
if ((lc->collection->flag & visibility_flag)) {
continue;
}
if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {