[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35797] trunk/blender/source: - fix for editfont using an enum func on boolean property.

Campbell Barton ideasman42 at gmail.com
Sat Mar 26 10:36:45 CET 2011


Revision: 35797
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35797
Author:   campbellbarton
Date:     2011-03-26 09:36:45 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
- fix for editfont using an enum func on boolean property.
- updated FBX export test hash.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editfont.c
    trunk/blender/source/tests/CMakeLists.txt

Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c	2011-03-26 09:09:00 UTC (rev 35796)
+++ trunk/blender/source/blender/editors/curve/editfont.c	2011-03-26 09:36:45 UTC (rev 35797)
@@ -616,7 +616,7 @@
 	{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,11 +641,9 @@
 
 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);
 }
 

Modified: trunk/blender/source/tests/CMakeLists.txt
===================================================================
--- trunk/blender/source/tests/CMakeLists.txt	2011-03-26 09:09:00 UTC (rev 35796)
+++ trunk/blender/source/tests/CMakeLists.txt	2011-03-26 09:36:45 UTC (rev 35797)
@@ -276,5 +276,5 @@
 	--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
 )




More information about the Bf-blender-cvs mailing list