Merged changes in the trunk up to revision 30551.

This commit is contained in:
2010-07-20 19:39:07 +00:00
parent bd68a72869
commit e423e085f8
200 changed files with 20606 additions and 12262 deletions

View File

@@ -197,7 +197,7 @@ static void id_search_cb(const bContext *C, void *arg_template, char *str, uiSea
RNA_parameter_set_lookup(&parms, "context", &C);
if (RNA_function_call(C, &reports, &ptr, func, &parms) == 0) {
if (RNA_function_call((bContext *)C, &reports, &ptr, func, &parms) == 0) {
int* ret;
RNA_parameter_get_lookup(&parms, "ret", (void **)&ret);