[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54071] trunk/blender: fix for missing initialization of vert data in ccgDM_copyFinalVertArray

[Campbell Barton]

Revision: 54071
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54071
Author:   campbellbarton
Date:     2013-01-24 09:36:22 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
fix for missing initialization of vert data in ccgDM_copyFinalVertArray

Modified Paths:
--------------
    trunk/blender/build_files/cmake/project_info.py
    trunk/blender/build_files/cmake/project_source_info.py
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py	2013-01-24 08:59:48 UTC (rev 54070)
+++ trunk/blender/build_files/cmake/project_info.py	2013-01-24 09:36:22 UTC (rev 54071)
@@ -141,7 +141,7 @@
         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

Modified: trunk/blender/build_files/cmake/project_source_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_source_info.py	2013-01-24 08:59:48 UTC (rev 54070)
+++ trunk/blender/build_files/cmake/project_source_info.py	2013-01-24 09:36:22 UTC (rev 54071)
@@ -86,7 +86,7 @@
     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,

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-01-24 08:59:48 UTC (rev 54070)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-01-24 09:36:22 UTC (rev 54071)
@@ -1119,6 +1119,7 @@
 		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++) {