Merged changes in the trunk up to revision 30397.
[blender.git] / source / blender / editors / interface / interface_templates.c
index f8e94b87ea951fed9f0162cb222cfb8d27e93eb2..d2b8b5018adff61fbb67fc4f7aeca1ce913a668a 100644 (file)
@@ -199,7 +199,7 @@ static void id_search_cb(const bContext *C, void *arg_template, char *str, uiSea
 
                                        if (RNA_function_call(C, &reports, &ptr, func, &parms) == 0) {
                                                int* ret;
-                                               RNA_parameter_get_lookup(&parms, "ret", &ret);
+                                               RNA_parameter_get_lookup(&parms, "ret", (void **)&ret);
 
                                                if (!(*ret)) {
                                                        RNA_parameter_list_free(&parms);
@@ -2051,7 +2051,7 @@ void uiTemplateTriColorSet(uiLayout *layout, PointerRNA *ptr, char *propname)
        csPtr= RNA_property_pointer_get(ptr, prop);
        
        uiItemR(row, &csPtr, "normal", 0, "", 0);
-       uiItemR(row, &csPtr, "selected", 0, "", 0);
+       uiItemR(row, &csPtr, "select", 0, "", 0);
        uiItemR(row, &csPtr, "active", 0, "", 0);
 }