diff options
| -rw-r--r-- | build_files/cmake/Modules/FindOpenColorIO.cmake | 3 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_skinning.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_select.c | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index ac486a13a6d..bd1ecac0a39 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -83,6 +83,9 @@ ENDIF(OPENCOLORIO_FOUND) MARK_AS_ADVANCED( OPENCOLORIO_INCLUDE_DIR OPENCOLORIO_LIBRARY + OPENCOLORIO_OPENCOLORIO_LIBRARY + OPENCOLORIO_TINYXML_LIBRARY + OPENCOLORIO_YAML-CPP_LIBRARY ) UNSET(COMPONENT) diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 9ae9327462f..3126cca7457 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -280,7 +280,7 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob, if (numbones == 0) return; - if (BKE_object_defgroup_data_create(ob->data) == false) + if (BKE_object_defgroup_data_create(ob->data) == NULL) return; /* create an array of pointer to bones that are skinnable diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 2be5b8dc188..29de5c414d8 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -489,7 +489,7 @@ static int gpencil_circle_select_exec(bContext *C, wmOperator *op) const int gesture_mode = RNA_int_get(op->ptr, "gesture_mode"); const bool select = (gesture_mode == GESTURE_MODAL_SELECT); - GP_SpaceConversion gsc = {0}; + GP_SpaceConversion gsc = {NULL}; rcti rect = {0}; /* for bounding rect around circle (for quicky intersection testing) */ bool changed = false; @@ -562,7 +562,7 @@ static int gpencil_border_select_exec(bContext *C, wmOperator *op) const bool select = (gesture_mode == GESTURE_MODAL_SELECT); const bool extend = RNA_boolean_get(op->ptr, "extend"); - GP_SpaceConversion gsc = {0}; + GP_SpaceConversion gsc = {NULL}; rcti rect = {0}; bool changed = false; @@ -676,7 +676,7 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) int location[2] = {0}; int mx, my; - GP_SpaceConversion gsc = {0}; + GP_SpaceConversion gsc = {NULL}; bGPDstroke *hit_stroke = NULL; bGPDspoint *hit_point = NULL; @@ -835,5 +835,3 @@ void GPENCIL_OT_select(wmOperatorType *ot) } /* ********************************************** */ - -
\ No newline at end of file |