Merge pull request #74496 from juliuse98/master
Fix blend-file import when using custom color management in blender
This commit is contained in:
commit
13ad374102
1 changed files with 3 additions and 2 deletions
|
@ -297,13 +297,14 @@ static bool _test_blender_path(const String &p_path, String *r_err = nullptr) {
|
|||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
if (pipe.find("Blender ") != 0) {
|
||||
int bl = pipe.find("Blender ");
|
||||
if (bl == -1) {
|
||||
if (r_err) {
|
||||
*r_err = vformat(TTR("Unexpected --version output from Blender binary at: %s"), path);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
pipe = pipe.substr(bl);
|
||||
pipe = pipe.replace_first("Blender ", "");
|
||||
int pp = pipe.find(".");
|
||||
if (pp == -1) {
|
||||
|
|
Loading…
Reference in a new issue