svn merge -r40222:40344 ^/trunk/blender

This commit is contained in:
Sergey Sharybin
2011-09-19 10:48:15 +00:00
176 changed files with 2918 additions and 1256 deletions

View File

@@ -560,7 +560,7 @@ static int set_engine(int argc, const char **argv, void *data)
RenderData *rd = &scene->r;
if(BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) {
BLI_strncpy(rd->engine, argv[1], sizeof(rd->engine));
BLI_strncpy_utf8(rd->engine, argv[1], sizeof(rd->engine));
}
}
}