Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/editors/curve/editfont.c8
-rw-r--r--source/tests/CMakeLists.txt2
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 34fe2d68cc7..88842f36efd 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -616,7 +616,7 @@ static EnumPropertyItem style_items[]= {
{CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""},
{0, NULL, 0, NULL, NULL}};
-static int set_style(bContext *C, int style, int clear)
+static int set_style(bContext *C, const int style, const int clear)
{
Object *obedit= CTX_data_edit_object(C);
Curve *cu= obedit->data;
@@ -641,10 +641,8 @@ static int set_style(bContext *C, int style, int clear)
static int set_style_exec(bContext *C, wmOperator *op)
{
- int style, clear;
-
- style= RNA_enum_get(op->ptr, "style");
- clear= RNA_enum_get(op->ptr, "clear");
+ const int style= RNA_enum_get(op->ptr, "style");
+ const int clear= RNA_boolean_get(op->ptr, "clear");
return set_style(C, style, clear);
}
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index 0430b49181e..7bfebf3a123 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -276,5 +276,5 @@ add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/export_fbx_all_objects.fbx',use_selection=False,use_metadata=False\)
--md5_source=${TEST_OUT_DIR}/export_fbx_all_objects.fbx
- --md5=be69cf0baf51dcf43f579183310cb383 --md5_method=FILE
+ --md5=fdcd9021da2aaa9b5a32e6ef91ec1799 --md5_method=FILE
)