svn merge ^/trunk/blender -r43864:43887
authorCampbell Barton <ideasman42@gmail.com>
Sun, 5 Feb 2012 02:30:30 +0000 (02:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 5 Feb 2012 02:30:30 +0000 (02:30 +0000)
1  2 
build_files/cmake/cmake_static_check_cppcheck.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/transform/transform.c
source/blender/modifiers/intern/MOD_meshdeform.c

@@@ -37,10 -37,10 +37,10 @@@ CHECKER_BIN = "cppcheck
  CHECKER_ARGS = [
      # not sure why this is needed, but it is.
      "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-       "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+     "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
      # "--max-configs=1",  # speeds up execution
      #  "--check-config", # when includes are missing
 -    #  "--enable=all",  # if you want sixty hundred pedantic suggestions
 +    "--enable=all",  # if you want sixty hundred pedantic suggestions
      ]