Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-03-08 14:45:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-03-08 14:45:18 +0300
commit75cb4850f098cb5a1306d661477f67bca3dcd4b0 (patch)
tree4a83f2d88e3d15c8de7cc132a7ccc1eee56443b6 /intern/cycles/util/util_path.cpp
parentecfbfe478b3c6c944c61ff6c489b35e27c8121f4 (diff)
Cycles: Use 1-based line number for #line directives
AMD CPU platform was complaining about #line 0 directives in the code.
Diffstat (limited to 'intern/cycles/util/util_path.cpp')
-rw-r--r--intern/cycles/util/util_path.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index 5df262fcbbb..1b2e8aace5b 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -814,7 +814,7 @@ string path_source_replace_includes(const string& source,
/* Use line directives for better error messages. */
line = line_directive(filepath, 1)
+ token.replace(0, n_end + 1, "\n" + text + "\n")
- + line_directive(path_join(path, source_filename), i);
+ + line_directive(path_join(path, source_filename), i + 1);
}
}
}