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

Cleanup: various non-functional C++ changes, correct doxy groups

Browse Source
This commit is contained in:
Campbell Barton
2023-08-12 18:48:20 +10:00
parent 931467cbd5
commit 848e808b8a
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/render/render_preview.cc
View File

@@ -197,6 +197,8 @@ void ED_preview_ensure_dbase(const bool with_gpencil)
datatoc_preview_grease_pencil_blend_size);
base_initialized_gpencil = true;
}
#else
UNUSED_VARS(with_gpencil);
#endif
}

8
source/blender/editors/space_graph/graph_slider_ops.cc
View File

@@ -1007,7 +1007,7 @@ static void blend_offset_modal_update(bContext *C, wmOperator *op)
reset_bezts(gso);
const float factor = slider_factor_get_and_remember(op);
blend_offset_graph_keys(&gso->ac, factor);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
}
static int blend_offset_invoke(bContext *C, wmOperator *op, const wmEvent *event)
@@ -1042,7 +1042,7 @@ static int blend_offset_exec(bContext *C, wmOperator *op)
blend_offset_graph_keys(&ac, factor);
/* Set notifier that keyframes have changed. */
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
return OPERATOR_FINISHED;
}
@@ -1098,7 +1098,7 @@ static void blend_to_ease_modal_update(bContext *C, wmOperator *op)
reset_bezts(gso);
const float factor = slider_factor_get_and_remember(op);
blend_to_ease_graph_keys(&gso->ac, factor);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
}
static int blend_to_ease_invoke(bContext *C, wmOperator *op, const wmEvent *event)
@@ -1134,7 +1134,7 @@ static int blend_to_ease_exec(bContext *C, wmOperator *op)
blend_to_ease_graph_keys(&ac, factor);
/* Set notifier that keyframes have changed. */
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, nullptr);
return OPERATOR_FINISHED;
}

6
source/blender/io/usd/intern/usd_hook.cc
View File

@@ -32,7 +32,7 @@ using USDHookList = std::list<USDHook *>;
/* USD hook type declarations */
static USDHookList g_usd_hooks;
void USD_register_hook(struct USDHook *hook)
void USD_register_hook(USDHook *hook)
{
if (std::find(g_usd_hooks.begin(), g_usd_hooks.end(), hook) != g_usd_hooks.end()) {
/* The hook is already in the list. */
@@ -43,7 +43,7 @@ void USD_register_hook(struct USDHook *hook)
g_usd_hooks.push_back(hook);
}
void USD_unregister_hook(struct USDHook *hook)
void USD_unregister_hook(USDHook *hook)
{
g_usd_hooks.remove(hook);
}
@@ -57,7 +57,7 @@ USDHook *USD_find_hook_name(const char name[])
USDHookList::iterator hook_iter = std::find_if(
g_usd_hooks.begin(), g_usd_hooks.end(), [name](USDHook *hook) {
return strcmp(hook->idname, name) == 0;
return STREQ(hook->idname, name);
});
return (hook_iter == g_usd_hooks.end()) ? nullptr : *hook_iter;

3
source/blender/io/usd/intern/usd_reader_mesh.cc
View File

@@ -530,8 +530,7 @@ void USDMeshReader::read_uv_data_primvar(Mesh *mesh,
return;
}
if (varying_type == pxr::UsdGeomTokens->faceVarying ||
varying_type == pxr::UsdGeomTokens->varying) {
if (ELEM(varying_type, pxr::UsdGeomTokens->faceVarying, pxr::UsdGeomTokens->varying)) {
if (is_left_handed_) {
/* Reverse the index order. */
const OffsetIndices faces = mesh->faces();

2
source/blender/makesrna/intern/rna_color.cc
View File

@@ -1274,7 +1274,7 @@ static void rna_def_colormanage(BlenderRNA *brna)
RNA_def_property_update(prop, NC_WINDOW, "rna_ColorManagement_update");
prop = RNA_def_property(srna, "use_hdr_view", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", COLORMANAGE_VIEW_USE_HDR);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", COLORMANAGE_VIEW_USE_HDR);
RNA_def_property_ui_text(
prop,
"High Dynamic Range",