diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 13:36:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 13:36:22 +0400 |
| commit | 8a60c7dc7dd0c83c69a451efe1ab49e5db0cdb74 (patch) | |
| tree | 5124cd0bf4a19c04e8a9b6a41c6f767abec7b7d4 | |
| parent | a790c8c6f9e8b9f9bd954c1357c3bc826ed60c9e (diff) | |
fix for missing initialization of vert data in ccgDM_copyFinalVertArray
| -rwxr-xr-x | build_files/cmake/project_info.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/project_source_info.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index ff123251195..73648be3f15 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -141,7 +141,7 @@ def cmake_advanced_info(): if sys.platform == "win32": cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR else: - if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"): + if make_exe_basename.startswith(("make", "gmake")): cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR elif make_exe_basename.startswith("ninja"): cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index f2059b18ab4..90e240c35ef 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -86,7 +86,7 @@ def makefile_log(): make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") make_exe_basename = os.path.basename(make_exe) - if make_exe_basename.startswith("make") or make_exe_basename.startswith("gmake"): + if make_exe_basename.startswith(("make", "gmake")): print("running 'make' with --dry-run ...") process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], stdout=subprocess.PIPE, diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index d665269c6ca..8a4471eec29 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1119,6 +1119,7 @@ static void ccgDM_copyFinalVertArray(DerivedMesh *dm, MVert *mvert) vd = ccgSubSurf_getFaceCenterData(f); copy_v3_v3(mvert[i].co, CCG_elem_co(&key, vd)); normal_float_to_short_v3(mvert[i].no, CCG_elem_no(&key, vd)); + mvert[i].flag = mvert[i].bweight = 0; i++; for (S = 0; S < numVerts; S++) { |