fix for missing initialization of vert data in ccgDM_copyFinalVertArray
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 09:36:22 +0000 (09:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 Jan 2013 09:36:22 +0000 (09:36 +0000)
build_files/cmake/project_info.py
build_files/cmake/project_source_info.py
source/blender/blenkernel/intern/subsurf_ccg.c

index ff1232511956469640164ebad1e822303feaa6d1..73648be3f15f59764e76324f9bb2a7cdab5a4f05 100755 (executable)
@@ -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
index f2059b18ab4f68ba9e5b3eb48e1b0e286cecb196..90e240c35ef80ad2a84afc26136f83242c310eb8 100644 (file)
@@ -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,
index d665269c6ca10720b5054512ff5c7ba0286c0e7d..8a4471eec29aee65335bd4ddc85a72a1a3c97213 100644 (file)
@@ -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++) {