Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for missing initialization of vert data in ccgDM_copyFinalVertArray

Browse Source
This commit is contained in:
Campbell Barton
2013-01-24 09:36:22 +00:00
parent a790c8c6f9
commit 8a60c7dc7d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/project_info.py
View File

@@ -141,7 +141,7 @@ def cmake_advanced_info():
if sys.platform == "win32": if sys.platform == "win32":
cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else: 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 cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
elif make_exe_basename.startswith("ninja"): elif make_exe_basename.startswith("ninja"):
cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR

2
build_files/cmake/project_source_info.py
View File

@@ -86,7 +86,7 @@ def makefile_log():
make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
make_exe_basename = os.path.basename(make_exe) 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 ...") print("running 'make' with --dry-run ...")
process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,

1
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -1119,6 +1119,7 @@ static void ccgDM_copyFinalVertArray(DerivedMesh *dm, MVert *mvert)
vd = ccgSubSurf_getFaceCenterData(f); vd = ccgSubSurf_getFaceCenterData(f);
copy_v3_v3(mvert[i].co, CCG_elem_co(&key, vd)); copy_v3_v3(mvert[i].co, CCG_elem_co(&key, vd));
normal_float_to_short_v3(mvert[i].no, CCG_elem_no(&key, vd)); normal_float_to_short_v3(mvert[i].no, CCG_elem_no(&key, vd));
mvert[i].flag = mvert[i].bweight = 0;
i++; i++;
for (S = 0; S < numVerts; S++) { for (S = 0; S < numVerts; S++) {