- fix for editfont using an enum func on boolean property.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Mar 2011 09:36:45 +0000 (09:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Mar 2011 09:36:45 +0000 (09:36 +0000)
- updated FBX export test hash.

source/blender/editors/curve/editfont.c
source/tests/CMakeLists.txt

index 34fe2d68cc719fe142de7e7be3e30bdf1c1a6435..88842f36efd5f5bd2076dbc2eab8d1f299d1147f 100644 (file)
@@ -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);
 }
index 0430b49181ee7414b4b517718817ba0b4c299e91..7bfebf3a123854bdd06ca7e2d3a8da81a506c44d 100644 (file)
@@ -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
 )