Revision: 35677
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35677
Author: campbellbarton
Date: 2011-03-21 23:30:56 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
fix for grease pencil conversion to bezier curve reading past the end of the
array.
Modified Paths:
--------------
trunk/blender/build_files/package_spec/build_archive.py
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
Modified: trunk/blender/build_files/package_spec/build_archive.py
===================================================================
--- trunk/blender/build_files/package_spec/build_archive.py 2011-03-21
22:39:30 UTC (rev 35676)
+++ trunk/blender/build_files/package_spec/build_archive.py 2011-03-21
23:30:56 UTC (rev 35677)
@@ -10,8 +10,8 @@
# get parameters
if len(sys.argv) < 5:
- sys.stderr.write('Excepted arguments: ./build_archive.py name extension
install_dir output_dir')
- sys.exit(1)
+ sys.stderr.write('Excepted arguments: ./build_archive.py name extension
install_dir output_dir')
+ sys.exit(1)
package_name = sys.argv[1]
extension = sys.argv[2]
@@ -23,47 +23,46 @@
# remove existing package with the same name
try:
- if os.path.exists(package_archive):
- os.remove(package_archive)
- if os.path.exists(package_dir):
- shutil.rmtree(package_dir)
+ if os.path.exists(package_archive):
+ os.remove(package_archive)
+ if os.path.exists(package_dir):
+ shutil.rmtree(package_dir)
except:
- sys.stderr.write('Failed to clean up old package files: ' +
sys.exc_info()[0] + '\n')
- sys.exit(1)
+ sys.stderr.write('Failed to clean up old package files: ' +
sys.exc_info()[0] + '\n')
+ sys.exit(1)
# create temporary package dir
try:
- shutil.copytree(install_dir, package_dir)
+ shutil.copytree(install_dir, package_dir)
- for f in os.listdir(package_dir):
- if f.startswith('makes'):
- os.remove(os.path.join(package_dir, f))
+ for f in os.listdir(package_dir):
+ if f.startswith('makes'):
+ os.remove(os.path.join(package_dir, f))
except:
- sys.stderr.write('Failed to copy install directory: ' +
sys.exc_info()[0] + '\n')
- sys.exit(1)
+ sys.stderr.write('Failed to copy install directory: ' + sys.exc_info()[0]
+ '\n')
+ sys.exit(1)
# create archive
try:
- if not os.path.exists(output_dir):
- os.mkdir(output_dir)
+ if not os.path.exists(output_dir):
+ os.mkdir(output_dir)
- if extension == 'zip':
- archive_cmd = ['zip', '-9', '-r', package_archive, package_dir]
- elif extension == 'tar.bz2':
- archive_cmd = ['tar', 'cjf', package_archive, package_dir]
- else:
- sys.stderr.write('Unknown archive extension: ' + extension)
- sys.exit(-1)
+ if extension == 'zip':
+ archive_cmd = ['zip', '-9', '-r', package_archive, package_dir]
+ elif extension == 'tar.bz2':
+ archive_cmd = ['tar', 'cjf', package_archive, package_dir]
+ else:
+ sys.stderr.write('Unknown archive extension: ' + extension)
+ sys.exit(-1)
- subprocess.call(archive_cmd)
+ subprocess.call(archive_cmd)
except:
- sys.stderr.write('Failed to create package archive: ' +
sys.exc_info()[0] + '\n')
- sys.exit(1)
+ sys.stderr.write('Failed to create package archive: ' + sys.exc_info()[0]
+ '\n')
+ sys.exit(1)
# empty temporary package dir
try:
- shutil.rmtree(package_dir)
+ shutil.rmtree(package_dir)
except:
- sys.stderr.write('Failed to clean up package directory: ' +
sys.exc_info()[0] + '\n')
- sys.exit(1)
-
+ sys.stderr.write('Failed to clean up package directory: ' +
sys.exc_info()[0] + '\n')
+ sys.exit(1)
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-03-21
22:39:30 UTC (rev 35676)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-03-21
23:30:56 UTC (rev 35677)
@@ -488,7 +488,7 @@
copy_v3_v3(p3d_prev, p3d_cur);
copy_v3_v3(p3d_cur, p3d_next);
- if (i < tot) {
+ if (i + 1 < tot) {
gp_strokepoint_convertcoords(C, gps, pt+1, p3d_next);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
