griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton
2020-11-12 11:23:21 +11:00
parent 2ef2b3e0fd
commit 9e1e9516a0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
View File

@@ -62,7 +62,7 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
tgp_ob->do_mat_holdout = false;
for (int i = 0; i < ob->totcol; i++) {
MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, i + 1);
if ((gp_style != NULL) && (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT) ||
if (((gp_style != NULL) && (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT)) ||
((gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT))) {
tgp_ob->do_mat_holdout = true;
break;

4
source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
View File

@@ -47,13 +47,13 @@ class ObjectsChildrenBuilder {
ObjectTreeElementsMap object_tree_elements_map_;
public:
ObjectsChildrenBuilder(SpaceOutliner &);
ObjectsChildrenBuilder(SpaceOutliner &soutliner);
~ObjectsChildrenBuilder() = default;
void operator()(TreeElement &collection_tree_elem);
private:
void object_tree_elements_lookup_create_recursive(TreeElement *);
void object_tree_elements_lookup_create_recursive(TreeElement *te_parent);
void make_object_parent_hierarchy_collections();
};