[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52828] trunk/blender: make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops. image.project_apply() only use local images.

[Campbell Barton]

Revision: 52828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52828
Author:   campbellbarton
Date:     2012-12-09 14:17:33 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops.image.project_apply() only use local images.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
    trunk/blender/release/scripts/startup/bl_operators/image.py

Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py	2012-12-09 12:43:40 UTC (rev 52827)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py	2012-12-09 14:17:33 UTC (rev 52828)
@@ -46,7 +46,10 @@
     #  "--enable=all",  # if you want sixty hundred pedantic suggestions
     ]
 
+if USE_QUIET:
+    CHECKER_ARGS.append("--quiet")
 
+
 def main():
     source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
 
@@ -78,6 +81,8 @@
 
     project_source_info.queue_processes(process_functions)
 
+    print("Finished!")
 
+
 if __name__ == "__main__":
     main()

Modified: trunk/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/image.py	2012-12-09 12:43:40 UTC (rev 52827)
+++ trunk/blender/release/scripts/startup/bl_operators/image.py	2012-12-09 14:17:33 UTC (rev 52828)
@@ -224,7 +224,7 @@
         image_name = ProjectEdit._proj_hack[0]  # TODO, deal with this nicer
 
         try:
-            image = bpy.data.images[image_name]
+            image = bpy.data.images[image_name, None]
         except KeyError:
             import traceback
             traceback.print_exc()