Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops.image.project_apply() only use local images.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-09 14:17:33 +00:00
parent 98fab9e530
commit 7376fb2913
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/cmake/cmake_static_check_cppcheck.py
View File

@@ -46,6 +46,9 @@ CHECKER_ARGS = [
# "--enable=all", # if you want sixty hundred pedantic suggestions # "--enable=all", # if you want sixty hundred pedantic suggestions
] ]
if USE_QUIET:
CHECKER_ARGS.append("--quiet")
def main(): def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX) source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
@@ -78,6 +81,8 @@ def main():
project_source_info.queue_processes(process_functions) project_source_info.queue_processes(process_functions)
print("Finished!")
if __name__ == "__main__": if __name__ == "__main__":
main() main()

2
release/scripts/startup/bl_operators/image.py
View File

@@ -224,7 +224,7 @@ class ProjectApply(Operator):
image_name = ProjectEdit._proj_hack[0] # TODO, deal with this nicer image_name = ProjectEdit._proj_hack[0] # TODO, deal with this nicer
try: try:
image = bpy.data.images[image_name] image = bpy.data.images[image_name, None]
except KeyError: except KeyError:
import traceback import traceback
traceback.print_exc() traceback.print_exc()