sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- fix for editfont using an enum func on boolean property.

Browse Source 
- updated FBX export test hash.
This commit is contained in:
Campbell Barton 2011-03-26 09:36:45 +00:00
parent ac2d935a32
commit f141c81b5b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/curve/editfont.c
View File

@ -616,7 +616,7 @@ static EnumPropertyItem style_items[]= {
{CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""}, {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""},
{0, NULL, 0, NULL, NULL}}; {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); Object *obedit= CTX_data_edit_object(C);
Curve *cu= obedit->data; 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) static int set_style_exec(bContext *C, wmOperator *op)
{ {
int style, clear; const int style= RNA_enum_get(op->ptr, "style");
const int clear= RNA_boolean_get(op->ptr, "clear");
style= RNA_enum_get(op->ptr, "style");
clear= RNA_enum_get(op->ptr, "clear");
return set_style(C, style, clear); return set_style(C, style, clear);
} }

2
source/tests/CMakeLists.txt
View File

@ -276,5 +276,5 @@ add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py -- --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\) --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_source=${TEST_OUT_DIR}/export_fbx_all_objects.fbx
--md5=be69cf0baf51dcf43f579183310cb383 --md5_method=FILE --md5=fdcd9021da2aaa9b5a32e6ef91ec1799 --md5_method=FILE
) )