[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30292] branches/soc-2010-jwilkins: * removed strength multiplier.
Revision: 30292
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30292
Author: jwilkins
Date: 2010-07-14 08:27:31 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* removed strength multiplier. the limit on strength is a soft limit, the hard
limit is 10
* moved variables used to draw brush from Brush to Sculpt, there only needs to
be one copy of these at a time, not one set per brush
* bumped up sub file version number so any files saved can be differentiated
from older files. I expect this to be a vert short lived thing as the file
version should jump with the upcoming 253 release
* removed 'duplicate brush' button and made the + button duplicate the current
brush (or create a new brush if all are deleted)
* changed some defaults for new brushes
* do_versions and init_userdef_do_versions do some sanity checking and set
defaults values new in this branch
Modified Paths:
--
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/interface/resources.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 04:43:03 UTC (rev 30291)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 06:27:31 UTC (rev 30292)
@@ -525,8 +525,6 @@
row.template_list(settings, brushes, settings,
active_brush_index, rows=2, maxrows=defaultbrushes)
-col.operator(brush.copy, text=Duplicate Brush)
-
# Particle Mode #
# XXX This needs a check if psys is editable.
@@ -604,8 +602,6 @@
row.prop(brush, use_strength_pressure, text=)
-row = col.row()
-row.prop(brush, strength_multiplier)
if brush.sculpt_tool not in ('SMOOTH'):
col.separator()
@@ -895,13 +891,9 @@
if context.sculpt_object:
col.prop(brush, sculpt_tool, expand=False, text=)
elif context.texture_paint_object:
-col.prop(brush, imagepaint_tool, expand=True)
-#col.prop_enum(settings, tool, 'DRAW')
-#col.prop_enum(settings, tool, 'SOFTEN')
-#col.prop_enum(settings, tool, 'CLONE')
-#col.prop_enum(settings, tool, 'SMEAR')
+col.prop(brush, imagepaint_tool, expand=False, text=)
elif context.vertex_paint_object or context.weight_paint_object:
-col.prop(brush, vertexpaint_tool, expand=True)
+col.prop(brush, vertexpaint_tool, expand=False, text=)
class VIEW3D_PT_tools_brush_stroke(PaintPanel):
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
===
--- branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
2010-07-14 04:43:03 UTC (rev 30291)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
2010-07-14 06:27:31 UTC (rev 30292)
@@ -43,9 +43,9 @@
struct ReportList;
struct Scene;
struct Main;
-
+
#define BLENDER_VERSION252
-#define BLENDER_SUBVERSION 5
+#define BLENDER_SUBVERSION 6 // XXX: this shouldn't be merged with
trunk, this is so Sculpt branch can detect old files
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
2010-07-14 04:43:03 UTC (rev 30291)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
2010-07-14 06:27:31 UTC (rev 30292)
@@ -71,57 +71,56 @@
/* BRUSH SCULPT TOOL SETTINGS */
brush-sculpt_tool = SCULPT_TOOL_DRAW; /* sculpting defaults to the
draw tool for new brushes */
- brush-plane_offset= 0.0f; /* how far above or below the plane that is
found by averaging the faces */
- brush-size= 50; /* radius of the
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30293] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r30286:30292
Revision: 30293
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30293
Author: campbellbarton
Date: 2010-07-14 09:04:56 +0200 (Wed, 14 Jul 2010)
Log Message:
---
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender
-r30286:30292
Modified Paths:
--
branches/render25/doc/blender.1.py
branches/render25/release/scripts/modules/rna_info.py
branches/render25/release/scripts/op/presets.py
branches/render25/release/scripts/ui/properties_data_armature.py
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/font.c
branches/render25/source/blender/editors/armature/armature_intern.h
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/gpu/gpu_buffers.h
branches/render25/source/blender/gpu/intern/gpu_draw.c
branches/render25/source/blender/makesdna/DNA_curve_types.h
branches/render25/source/blender/makesrna/intern/rna_curve.c
Modified: branches/render25/doc/blender.1.py
===
--- branches/render25/doc/blender.1.py 2010-07-14 06:27:31 UTC (rev 30292)
+++ branches/render25/doc/blender.1.py 2010-07-14 07:04:56 UTC (rev 30293)
@@ -31,12 +31,12 @@
data = data.replace(-, \\-)
data = data.replace(\t, )
# data = data.replace($, \\fI)
-
+
data_ls = []
for w in data.split():
if w.startswith($):
w = \\fI + w[1:] + \\fR
-
+
data_ls.append(w)
data = data[:len(data) - len(data.lstrip())] + .join(data_ls)
@@ -90,16 +90,16 @@
while lines:
l = lines.pop(0)
if l.startswith(Environment Variables:):
-fw('.SH ENVIRONMENT VARIABLES\n')
+fw('.SH ENVIRONMENT VARIABLES\n')
elif l.endswith(:): # one line
-fw('.SS %s\n\n' % l)
+fw('.SS %s\n\n' % l)
elif l.startswith(-) or l.startswith(/): # can be multi line
fw('.TP\n')
fw('.B %s\n' % man_format(l))
-
+
while lines:
-# line with no
+# line with no
if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): #
no white space
break
@@ -112,7 +112,7 @@
l = l[1:] # remove first whitespace (tab)
fw('%s\n' % man_format(l))
-
+
else:
if not l.strip():
fw('.br\n')
Modified: branches/render25/release/scripts/modules/rna_info.py
===
--- branches/render25/release/scripts/modules/rna_info.py 2010-07-14
06:27:31 UTC (rev 30292)
+++ branches/render25/release/scripts/modules/rna_info.py 2010-07-14
07:04:56 UTC (rev 30293)
@@ -631,6 +631,8 @@
props = [(prop.identifier, prop) for prop in v.properties]
for prop_id, prop in sorted(props):
+if prop.type == 'boolean':
+continue
data += %s.%s - %s:%s%s%s\n % (struct_id_str,
prop.identifier, prop.identifier, prop.type, , (read-only) if
prop.is_readonly else , prop.description)
if bpy.app.background:
Modified: branches/render25/release/scripts/op/presets.py
===
--- branches/render25/release/scripts/op/presets.py 2010-07-14 06:27:31 UTC
(rev 30292)
+++ branches/render25/release/scripts/op/presets.py 2010-07-14 07:04:56 UTC
(rev 30293)
@@ -27,8 +27,8 @@
subclasses must define
- preset_values
- preset_subdir '''
-bl_idname = script.add_preset_base
-bl_label = Add a Python Preset
+# bl_idname = script.preset_base_add
+# bl_label = Add a Python Preset
name = bpy.props.StringProperty(name=Name, description=Name of the
preset, used to make the path name, maxlen=64, default=)
Modified: branches/render25/release/scripts/ui/properties_data_armature.py
===
--- branches/render25/release/scripts/ui/properties_data_armature.py
2010-07-14 06:27:31 UTC (rev 30292)
+++ branches/render25/release/scripts/ui/properties_data_armature.py
2010-07-14 07:04:56 UTC (rev 30293)
@@ -160,15 +160,18 @@
col = split.column()
col.template_triColorSet(group, colors)
-row = layout.row(align=True)
+row = layout.row()
row.active = (ob.proxy is None)
-row.operator(pose.group_assign, text=Assign)
-row.operator(pose.group_unassign, text=Remove)
#row.operator(pose.bone_group_remove_from, text=Remove)
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30294] branches/soc-2010-jwilkins: * ' front face only' now uses the current sculpt plane
Revision: 30294
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30294
Author: jwilkins
Date: 2010-07-14 09:23:04 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* 'front face only' now uses the current sculpt plane
* inflate, pinch, and smooth should not show the sculpt plane selector
* inflate, pinch, and smooth use the view normal when 'front face only' is
enabled
Modified Paths:
--
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 07:04:56 UTC (rev 30293)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 07:23:04 UTC (rev 30294)
@@ -626,19 +626,18 @@
row = col.row(align=True)
row.prop(brush, crease_pinch_factor, slider=True)
+if brush.sculpt_tool not in ('PINCH', 'INFLATE', 'SMOOTH'):
+row = col.row(align=True)
+col.separator()
-col.separator()
+if brush.use_original_normal:
+row.prop(brush, use_original_normal, toggle=True,
text=, icon='LOCKED')
+else:
+row.prop(brush, use_original_normal, toggle=True,
text=, icon='UNLOCKED')
-row = col.row(align=True)
+row.prop(brush, sculpt_plane, text=)
-if brush.use_original_normal:
-row.prop(brush, use_original_normal, toggle=True, text=,
icon='LOCKED')
-else:
-row.prop(brush, use_original_normal, toggle=True, text=,
icon='UNLOCKED')
-
-row.prop(brush, sculpt_plane, text=)
-
if brush.sculpt_tool in ('CLAY', 'CLAY_TUBES', 'WAX', 'FLATTEN',
'FILL', 'SCRAPE'):
row = col.row(align=True)
row.prop(brush, plane_offset, slider=True)
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 07:04:56 UTC (rev 30293)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 07:23:04 UTC (rev 30294)
@@ -404,7 +404,7 @@
}
}
-static float frontface(SculptSession *ss, Brush *brush, short no[3], float
fno[3])
+static float frontface(Brush *brush, float sculpt_normal[3], short no[3],
float fno[3])
{
if (brush-flag BRUSH_FRONTFACE) {
float dot;
@@ -413,10 +413,10 @@
float tmp[3];
normal_short_to_float_v3(tmp, no);
- dot= dot_v3v3(tmp, ss-cache-view_normal);
+ dot= dot_v3v3(tmp, sculpt_normal);
}
else {
- dot= dot_v3v3(fno, ss-cache-view_normal);
+ dot= dot_v3v3(fno, sculpt_normal);
}
return dot 0 ? dot : 0;
@@ -1034,7 +1034,7 @@
BLI_pbvh_vertex_iter_begin(ss-pbvh, node, vd, PBVH_ITER_UNIQUE) {
if(sculpt_brush_test(test, vd.co)) {
- const float fade = bstrength*tex_strength(ss, brush,
vd.co, test.dist)*frontface(ss, brush, vd.no, vd.fno);
+ const float fade = bstrength*tex_strength(ss, brush,
vd.co, test.dist)*frontface(brush, ss-cache-view_normal, vd.no, vd.fno);
float avg[3], val[3];
neighbor_average(ss, avg, vd.vert_indices[vd.i]);
@@ -1127,7 +1127,7 @@
fno= data[index].no;
if(sculpt_brush_test(test, co)) {
- const float fade =
bstrength*tex_strength(ss, brush, co, test.dist)*frontface(ss, brush, NULL,
fno);
+ const float fade =
bstrength*tex_strength(ss, brush, co, test.dist)*frontface(brush,
ss-cache-view_normal, NULL, fno);
float *avg, val[3];
float n;
@@ -1222,7 +1222,7 @@
if (sculpt_brush_test(test, vd.co)) {
//if(sculpt_brush_test_cyl(test, vd.co,
ss-cache-location, area_normal)) {
/* offset vertex */
- float fade = tex_strength(ss, brush, vd.co,
test.dist)*frontface(ss, brush, vd.no, vd.fno);
+ float fade = tex_strength(ss, brush, vd.co,
test.dist)*frontface(brush, area_normal, vd.no, vd.fno);
mul_v3_v3fl(proxy[vd.i], offset, fade);
@@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30295] branches/soc-2010-jwilkins: * changed default pinch factor 0.5f
Revision: 30295
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30295
Author: jwilkins
Date: 2010-07-14 09:35:26 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* changed default pinch factor 0.5f
* changed control for pinch factor to simply read 'Pinch'
Modified Paths:
--
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 07:35:26 UTC (rev 30295)
@@ -624,7 +624,7 @@
col.separator()
row = col.row(align=True)
-row.prop(brush, crease_pinch_factor, slider=True)
+row.prop(brush, crease_pinch_factor, slider=True, Pinch)
if brush.sculpt_tool not in ('PINCH', 'INFLATE', 'SMOOTH'):
row = col.row(align=True)
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
2010-07-14 07:35:26 UTC (rev 30295)
@@ -74,7 +74,7 @@
brush-size= 35; /* radius of the brush in pixels */
brush-alpha= 0.5f; /* brush strength/intensity probably variable
should be renamed? */
brush-autosmooth_factor= 0.0f;
- brush-crease_pinch_factor= 2.0f/3.0f;
+ brush-crease_pinch_factor= 0.5f;
brush-sculpt_plane = SCULPT_DISP_DIR_VIEW;
brush-plane_offset= 0.0f; /* how far above or below the plane that is
found by averaging the faces */
brush-plane_trim= 0.5f;
Modified: branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
===
--- branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
2010-07-14 07:23:04 UTC (rev 30294)
+++ branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
2010-07-14 07:35:26 UTC (rev 30295)
@@ -10985,7 +10985,7 @@
// same as draw brush
if (brush-crease_pinch_factor == 0)
- brush-crease_pinch_factor = 2.0f/3.0f;
+ brush-crease_pinch_factor = 0.5f;
// will sculpt no vertexes
if (brush-plane_trim == 0)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30297] trunk/blender: pointcache support for relative external paths with the useual // prefix as well as library path option.
Revision: 30297
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30297
Author: campbellbarton
Date: 2010-07-14 09:47:03 +0200 (Wed, 14 Jul 2010)
Log Message:
---
pointcache support for relative external paths with the useual // prefix as
well as library path option.
Modified Paths:
--
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/source/blender/blenkernel/intern/pointcache.c
Modified: trunk/blender/release/scripts/ui/properties_physics_common.py
===
--- trunk/blender/release/scripts/ui/properties_physics_common.py
2010-07-14 07:35:39 UTC (rev 30296)
+++ trunk/blender/release/scripts/ui/properties_physics_common.py
2010-07-14 07:47:03 UTC (rev 30297)
@@ -46,7 +46,10 @@
split.prop(cache, name, text=File Name)
split.prop(cache, index, text=)
-layout.label(text=File Path:)
+row = layout.row()
+row.label(text=File Path:)
+row.prop(cache, use_library_path, Use Lib Path)
+
layout.prop(cache, filepath, text=)
layout.label(text=cache.info)
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-07-14
07:35:39 UTC (rev 30296)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-07-14
07:47:03 UTC (rev 30297)
@@ -1067,21 +1067,21 @@
static int ptcache_path(PTCacheID *pid, char *filename)
{
- Library *lib;
+ Library *lib= (pid)? pid-ob-id.lib: NULL;
+ const char *blendfilename= (lib (pid-cache-flag
PTCACHE_IGNORE_LIBPATH)==0) ? lib-filepath: G.sce;
size_t i;
- lib= (pid)? pid-ob-id.lib: NULL;
-
if(pid-cache-flag PTCACHE_EXTERNAL) {
strcpy(filename, pid-cache-path);
+
+ if(strncmp(filename, //, 2)==0)
+ BLI_path_abs(filename, blendfilename);
+
return BLI_add_slash(filename); /* new strlen() */
}
else if (G.relbase_valid || lib) {
char file[MAX_PTCACHE_PATH]; /* we dont want the dir, only the
file */
- char *blendfilename;
- blendfilename= (lib (pid-cache-flag
PTCACHE_IGNORE_LIBPATH)==0) ? lib-filepath: G.sce;
-
BLI_split_dirfile(blendfilename, NULL, file);
i = strlen(file);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30298] trunk/blender/source/blender/ editors/space_file/filelist.c: bugfix [#22840] Folders with .blend on the end are processed like .blend files
Revision: 30298
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30298
Author: campbellbarton
Date: 2010-07-14 10:00:03 +0200 (Wed, 14 Jul 2010)
Log Message:
---
bugfix [#22840] Folders with .blend on the end are processed like .blend files
elubie, this was added r27523 but cant see why it would be useful to have.
Modified Paths:
--
trunk/blender/source/blender/editors/space_file/filelist.c
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===
--- trunk/blender/source/blender/editors/space_file/filelist.c 2010-07-14
07:47:03 UTC (rev 30297)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2010-07-14
08:00:03 UTC (rev 30298)
@@ -807,9 +807,6 @@
/* Don't check extensions for directories */
if (file-type S_IFDIR) {
- if(BLO_has_bfile_extension(file-relname)) {
- file-flags |= BLENDERFILE;
- }
continue;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30299] trunk/blender/source/blender: [ #22782] Solidify Thickness negative and positive values are the same result
Revision: 30299
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30299
Author: campbellbarton
Date: 2010-07-14 10:24:24 +0200 (Wed, 14 Jul 2010)
Log Message:
---
[#22782] Solidify Thickness negative and positive values are the same result
more a communication problem but Ed Britton raises a valid point that often you
want the original faces so changing the default offset to -1.0.
Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2010-07-14
08:00:03 UTC (rev 30298)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2010-07-14
08:24:24 UTC (rev 30299)
@@ -2065,7 +2065,7 @@
RNA_def_property_float_sdna(prop, NULL, offset_fac);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -1, 1, 0.1, 4);
- RNA_def_property_ui_text(prop, Offset, );
+ RNA_def_property_ui_text(prop, Offset, Offset the thickness from the
center);
RNA_def_property_update(prop, 0, rna_Modifier_update);
prop= RNA_def_property(srna, edge_crease_inner, PROP_FLOAT,
PROP_FACTOR);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
2010-07-14 08:00:03 UTC (rev 30298)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
2010-07-14 08:24:24 UTC (rev 30299)
@@ -162,6 +162,7 @@
{
SolidifyModifierData *smd = (SolidifyModifierData*) md;
smd-offset = 0.01f;
+ smd-offset_fac = -1.0f;
smd-flag = MOD_SOLIDIFY_RIM;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30300] branches/soc-2010-jwilkins: * syntax error in space_view3d_toolbar.py
Revision: 30300
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30300
Author: jwilkins
Date: 2010-07-14 10:29:16 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* syntax error in space_view3d_toolbar.py
* removed wax brush
Modified Paths:
--
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 08:24:24 UTC (rev 30299)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 08:29:16 UTC (rev 30300)
@@ -624,7 +624,7 @@
col.separator()
row = col.row(align=True)
-row.prop(brush, crease_pinch_factor, slider=True, Pinch)
+row.prop(brush, crease_pinch_factor, slider=True,
text=Pinch)
if brush.sculpt_tool not in ('PINCH', 'INFLATE', 'SMOOTH'):
row = col.row(align=True)
@@ -638,7 +638,7 @@
row.prop(brush, sculpt_plane, text=)
-if brush.sculpt_tool in ('CLAY', 'CLAY_TUBES', 'WAX', 'FLATTEN',
'FILL', 'SCRAPE'):
+if brush.sculpt_tool in ('CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL',
'SCRAPE'):
row = col.row(align=True)
row.prop(brush, plane_offset, slider=True)
row.prop(brush, use_offset_pressure, text=)
@@ -656,7 +656,7 @@
row= col.row()
row.prop(brush, use_frontface, text=Front Faces Only)
-if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'LAYER',
'CLAY', 'CLAY_TUBES', 'WAX'):
+if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'LAYER',
'CLAY', 'CLAY_TUBES'):
col.separator()
col.row().prop(brush, direction, expand=True)
elif brush.sculpt_tool in ('FLATTEN'):
@@ -677,7 +677,7 @@
-if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'INFLATE',
'LAYER', 'CLAY', 'CLAY_TUBES', 'WAX'):
+if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'INFLATE',
'LAYER', 'CLAY', 'CLAY_TUBES'):
col.separator()
col.prop(brush, use_accumulate)
@@ -1108,7 +1108,7 @@
col = layout.column();
if context.sculpt_object and context.tool_settings.sculpt:
-if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'CLAY_TUBES',
'WAX', 'PINCH', 'CREASE', 'BLOB', 'FLATTEN'):
+if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'CLAY_TUBES',
'PINCH', 'CREASE', 'BLOB', 'FLATTEN'):
col.prop(brush, add_col, text=Add Color)
col.prop(brush, sub_col, text=Substract Color)
else:
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 08:24:24 UTC (rev 30299)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 08:29:16 UTC (rev 30300)
@@ -596,7 +596,6 @@
case SCULPT_TOOL_CLAY:
case SCULPT_TOOL_CLAY_TUBES:
case SCULPT_TOOL_DRAW:
- case SCULPT_TOOL_WAX:
case SCULPT_TOOL_LAYER:
return alpha * flip * pressure * overlap * feather;
@@ -2034,74 +2033,8 @@
BLI_pbvh_vertex_iter_begin(ss-pbvh, nodes[n], vd,
PBVH_ITER_UNIQUE) {
if (sculpt_brush_test_sq(test, vd.co)) {
- //if (sculpt_brush_test_cyl(test, vd.co,
ss-cache-location, p)) {
- float intr[3];
-
- point_plane_project(intr, vd.co, an, fc);
-
- sub_v3_v3v3(proxy[vd.i], intr, vd.co);
-
- if (plane_trim(ss-cache, brush, proxy[vd.i])) {
- const float fade =
bstrength*tex_strength(ss, brush, vd.co, sqrt(test.dist))*frontface(brush, an,
vd.no, vd.fno);
-
- mul_v3_fl(proxy[vd.i], fade);
-
- if(vd.mvert)
- vd.mvert-flag |=
ME_VERT_PBVH_UPDATE;
- }
- }
- }
- BLI_pbvh_vertex_iter_end;
- }
-}
-
-static void do_wax_brush(Sculpt *sd, SculptSession *ss, PBVHNode **nodes, int
totnode)
-{
- Brush *brush = paint_brush(sd-paint);
-
- float
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30301] trunk/blender/source/blender/ editors/interface/interface_regions.c: [#22830] Hex colour number ( COLOUR BALANCE) is out the range in video st
Revision: 30301 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30301 Author: campbellbarton Date: 2010-07-14 10:39:59 +0200 (Wed, 14 Jul 2010) Log Message: --- [#22830] Hex colour number (COLOUR BALANCE) is out the range in video strip - use FTOCHAR macro which clamps values above 1.0 (rather then wrapping) - also fixes a problem rounding down where white would display as FEFEFE rather then FF the report also mentions how editing colors above 255 is broken but think this isnt worth trying to support. Modified Paths: -- trunk/blender/source/blender/editors/interface/interface_regions.c Modified: trunk/blender/source/blender/editors/interface/interface_regions.c === --- trunk/blender/source/blender/editors/interface/interface_regions.c 2010-07-14 08:29:16 UTC (rev 30300) +++ trunk/blender/source/blender/editors/interface/interface_regions.c 2010-07-14 08:39:59 UTC (rev 30301) @@ -1600,7 +1600,7 @@ if (rgb_gamma[1] 1.0f) rgb_gamma[1] = modf(rgb_gamma[1], intpart); if (rgb_gamma[2] 1.0f) rgb_gamma[2] = modf(rgb_gamma[2], intpart); - sprintf(col, %02X%02X%02X, (unsigned int)(rgb_gamma[0]*255.0), (unsigned int)(rgb_gamma[1]*255.0), (unsigned int)(rgb_gamma[2]*255.0)); + sprintf(col, %02X%02X%02X, FTOCHAR(rgb_gamma[0]), FTOCHAR(rgb_gamma[1]), FTOCHAR(rgb_gamma[2])); strcpy(bt-poin, col); } @@ -1861,9 +1861,9 @@ } rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2); - - sprintf(hexcol, %02X%02X%02X, (unsigned int)(rgb_gamma[0]*255.0), (unsigned int)(rgb_gamma[1]*255.0), (unsigned int)(rgb_gamma[2]*255.0)); + sprintf(hexcol, %02X%02X%02X, FTOCHAR(rgb_gamma[0]), FTOCHAR(rgb_gamma[1]), FTOCHAR(rgb_gamma[2])); + bt= uiDefBut(block, TEX, 0, Hex: , 0, -60, butwidth, UI_UNIT_Y, hexcol, 0, 8, 0, 0, Hex triplet for color (#RRGGBB)); uiButSetFunc(bt, do_hex_rna_cb, bt, hexcol); uiDefBut(block, LABEL, 0, (Gamma Corrected), 0, -80, butwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30302] branches/soc-2010-nexyon/source/ blender/blenloader/intern/readfile.c: Fixed error in 2.4x sound conversion.
Revision: 30302
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30302
Author: nexyon
Date: 2010-07-14 10:52:06 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Fixed error in 2.4x sound conversion.
Modified Paths:
--
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
Modified: branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
===
--- branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
2010-07-14 08:39:59 UTC (rev 30301)
+++ branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
2010-07-14 08:52:06 UTC (rev 30302)
@@ -9684,7 +9684,7 @@
if(sAct-sound)
{
sound = newlibadr(fd, lib,
sAct-sound);
- sAct-flag = sound-flags |
SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0;
+ sAct-flag = sound-flags
SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0;
sAct-pitch = sound-pitch;
sAct-volume = sound-volume;
sAct-sound3D.reference_distance = sound-distance;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30303] trunk/blender/source/blender/ blenloader/intern/readfile.c: Merging revision 30301: 30302 from my GSoC branch to trunk, log:
Revision: 30303
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30303
Author: nexyon
Date: 2010-07-14 10:55:08 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Merging revision 30301:30302 from my GSoC branch to trunk, log:
Fixed error in 2.4x sound conversion.
Revision Links:
--
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30301
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-14
08:52:06 UTC (rev 30302)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-14
08:55:08 UTC (rev 30303)
@@ -9684,7 +9684,7 @@
if(sAct-sound)
{
sound = newlibadr(fd, lib,
sAct-sound);
- sAct-flag = sound-flags |
SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0;
+ sAct-flag = sound-flags
SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0;
sAct-pitch = sound-pitch;
sAct-volume = sound-volume;
sAct-sound3D.reference_distance = sound-distance;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30304] branches/soc-2010-nexyon/source/ gameengine/Ketsji/KX_PythonInit.cpp: Removed stopDSP, relict from FMOD.
Revision: 30304
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30304
Author: nexyon
Date: 2010-07-14 11:01:31 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Removed stopDSP, relict from FMOD.
Modified Paths:
--
branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_PythonInit.cpp
===
--- branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_PythonInit.cpp
2010-07-14 08:55:08 UTC (rev 30303)
+++ branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_PythonInit.cpp
2010-07-14 09:01:31 UTC (rev 30304)
@@ -379,15 +379,6 @@
return resultlist;
}
-
-static PyObject* gPyStopDSP(PyObject*, PyObject* args)
-{
-PyErr_SetString(PyExc_RuntimeError, no audio device available);
-return NULL;
-
- Py_RETURN_NONE;
-}
-
static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args)
{
float ticrate;
@@ -756,7 +747,6 @@
{getRandomFloat,(PyCFunction) gPyGetRandomFloat, METH_NOARGS, (const
char *)gPyGetRandomFloat_doc},
{setGravity,(PyCFunction) gPySetGravity, METH_O, (const char *)set
Gravitation},
{getSpectrum,(PyCFunction) gPyGetSpectrum, METH_NOARGS, (const char
*)get audio spectrum},
- {stopDSP,(PyCFunction) gPyStopDSP, METH_VARARGS, (const char *)stop
using the audio dsp (for performance reasons)},
{getMaxLogicFrame, (PyCFunction) gPyGetMaxLogicFrame, METH_NOARGS,
(const char *)Gets the max number of logic frame per render frame},
{setMaxLogicFrame, (PyCFunction) gPySetMaxLogicFrame, METH_VARARGS,
(const char *)Sets the max number of logic frame per render frame},
{getMaxPhysicsFrame, (PyCFunction) gPyGetMaxPhysicsFrame,
METH_NOARGS, (const char *)Gets the max number of physics frame per render
frame},
@@ -939,7 +929,6 @@
Py_RETURN_NONE;
}
-
static PyObject* gPySetMistStart(PyObject*, PyObject* args)
{
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30305] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * do_mesh_smooth_brush allocated proxy even though it doesn't use it
Revision: 30305 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30305 Author: jwilkins Date: 2010-07-14 11:31:09 +0200 (Wed, 14 Jul 2010) Log Message: --- * do_mesh_smooth_brush allocated proxy even though it doesn't use it Modified Paths: -- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c === --- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14 09:01:31 UTC (rev 30304) +++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14 09:31:09 UTC (rev 30305) @@ -1023,9 +1023,6 @@ Brush *brush = paint_brush(sd-paint); PBVHVertexIter vd; SculptBrushTest test; - float (*proxy)[3]; - - proxy= BLI_pbvh_node_add_proxy(ss-pbvh, node)-co; CLAMP(bstrength, 0.0f, 1.0f); @@ -1318,7 +1315,6 @@ float val[3]; sub_v3_v3v3(val, test.location, vd.co); - //mul_v3_v3(val, ss-cache-scale); mul_v3_v3fl(proxy[vd.i], val, fade); if(vd.mvert) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30306] trunk/blender/release/scripts/op/ object.py: select parent/child now works for multiple selections ([/] keys)
Revision: 30306
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30306
Author: campbellbarton
Date: 2010-07-14 11:40:26 +0200 (Wed, 14 Jul 2010)
Log Message:
---
select parent/child now works for multiple selections ([/] keys)
Modified Paths:
--
trunk/blender/release/scripts/op/object.py
Modified: trunk/blender/release/scripts/op/object.py
===
--- trunk/blender/release/scripts/op/object.py 2010-07-14 09:31:09 UTC (rev
30305)
+++ trunk/blender/release/scripts/op/object.py 2010-07-14 09:40:26 UTC (rev
30306)
@@ -113,25 +113,43 @@
return context.object
def execute(self, context):
-obj = context.object
+objs = context.selected_objects
+obj_act = context.object
+
+if context.object not in objs:
+objs.append(context.object)
+
+if not self.properties.extend:
+# for obj in objs:
+# obj.selected = False
+bpy.ops.object.select_all(action='DESELECT')
+
if self.properties.direction == 'PARENT':
-parent = obj.parent
-if not parent:
+parents = []
+for obj in objs:
+parent = obj.parent
+
+if parent:
+parents.append(parent)
+
+if obj_act == obj:
+context.scene.objects.active = parent
+
+parent.selected = True
+
+if parents:
return {'CANCELLED'}
-obj_act = parent
+
else:
-children = obj.children
-if len(children) != 1:
-return {'CANCELLED'}
-obj_act = children[0]
+children = []
+for obj in objs:
+children += list(obj.children)
+for obj_iter in children:
+obj_iter.selected = True
-if not self.properties.extend:
-# obj.selected = False
-bpy.ops.object.select_all(action='DESELECT')
+children.sort(key=lambda obj_iter: obj_iter.name)
+context.scene.objects.active = children[0]
-obj_act.selected = True
-context.scene.objects.active = obj_act
-
return {'FINISHED'}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30307] trunk/blender/source/blender: Fix #22816: crash in depsgraph loading some 2.49 files, tagging objects for
Revision: 30307
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30307
Author: blendix
Date: 2010-07-14 11:46:26 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Fix #22816: crash in depsgraph loading some 2.49 files, tagging objects for
update on load should be done later because it's not known yet which scene
is used with which layers visible before the windows are created.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===
--- trunk/blender/source/blender/blenkernel/intern/blender.c2010-07-14
09:40:26 UTC (rev 30306)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c2010-07-14
09:46:26 UTC (rev 30307)
@@ -313,8 +313,6 @@
/* baseflags, groups, make depsgraph, etc */
set_scene_bg(CTX_data_scene(C));
-
- DAG_on_load_update();
MEM_freeN(bfd);
}
@@ -478,6 +476,9 @@
strcpy(G.sce, scestr);
G.fileflags= fileflags;
+ if(success)
+ DAG_on_load_update();
+
return success;
}
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2010-07-14
09:40:26 UTC (rev 30306)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2010-07-14
09:46:26 UTC (rev 30307)
@@ -2217,7 +2217,7 @@
*sce= bmain-scene.first;
if(*sce) *lay= (*sce)-lay;
- /* XXX for background mode, we should get the scen
+ /* XXX for background mode, we should get the scene
from somewhere, for the -S option, but it's in
the context, how to get it here? */
}
@@ -2248,7 +2248,7 @@
dag_current_scene_layers(bmain, scene, lay);
- if(scene) {
+ if(scene scene-theDag) {
/* derivedmeshes and displists are not saved to file so need to
be
remade, tag them so they get remade in the scene update loop,
note armature poses or object matrices are preserved and do
not
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2010-07-14 09:40:26 UTC (rev 30306)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2010-07-14 09:46:26 UTC (rev 30307)
@@ -61,6 +61,7 @@
#include BKE_blender.h
#include BKE_context.h
+#include BKE_depsgraph.h
#include BKE_DerivedMesh.h
#include BKE_exotic.h
#include BKE_font.h
@@ -309,7 +310,9 @@
// refresh_interface_font();
CTX_wm_window_set(C, CTX_wm_manager(C)-windows.first);
+
ED_editors_init(C);
+ DAG_on_load_update();
#ifndef DISABLE_PYTHON
/* run any texts that were loaded in and flagged as modules */
@@ -389,6 +392,7 @@
BKE_write_undo(C, original); /* save current state */
ED_editors_init(C);
+ DAG_on_load_update();
WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL);
CTX_wm_window_set(C, NULL); /* exits queues */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30308] branches/soc-2010-jwilkins: * merged with head 30237-30299
Revision: 30308 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30308 Author: jwilkins Date: 2010-07-14 11:47:44 +0200 (Wed, 14 Jul 2010) Log Message: --- * merged with head 30237-30299 Modified Paths: -- branches/soc-2010-jwilkins/CMakeLists.txt branches/soc-2010-jwilkins/Makefile branches/soc-2010-jwilkins/SConstruct branches/soc-2010-jwilkins/doc/blender.1.py branches/soc-2010-jwilkins/extern/libopenjpeg/dwt.c branches/soc-2010-jwilkins/release/scripts/modules/rna_info.py branches/soc-2010-jwilkins/release/scripts/op/presets.py branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py branches/soc-2010-jwilkins/release/scripts/ui/properties_data_curve.py branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_common.py branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mball.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/pointcache.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/world.c branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c branches/soc-2010-jwilkins/source/blender/editors/armature/armature_intern.h branches/soc-2010-jwilkins/source/blender/editors/armature/armature_ops.c branches/soc-2010-jwilkins/source/blender/editors/armature/poseobject.c branches/soc-2010-jwilkins/source/blender/editors/curve/curve_ops.c branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c branches/soc-2010-jwilkins/source/blender/editors/include/ED_datafiles.h branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c branches/soc-2010-jwilkins/source/blender/gpu/gpu_buffers.h branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c branches/soc-2010-jwilkins/source/blender/makesdna/DNA_curve_types.h branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h branches/soc-2010-jwilkins/source/blender/makesdna/DNA_sequence_types.h branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main_api.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_pose.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_solidify.c branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c Added Paths: --- branches/soc-2010-jwilkins/build_files/ branches/soc-2010-jwilkins/build_files/cmake/ branches/soc-2010-jwilkins/build_files/cmake/macros.cmake branches/soc-2010-jwilkins/build_files/make/ branches/soc-2010-jwilkins/build_files/make/example_scripts/ branches/soc-2010-jwilkins/build_files/make/example_scripts/linux_nanmakefiles.sh
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30309] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r30292:30308
Revision: 30309
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30309
Author: campbellbarton
Date: 2010-07-14 12:02:43 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30292:30308
Modified Paths:
--
branches/render25/release/scripts/op/object.py
branches/render25/release/scripts/ui/properties_physics_common.py
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/modifiers/intern/MOD_solidify.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
Modified: branches/render25/release/scripts/op/object.py
===
--- branches/render25/release/scripts/op/object.py 2010-07-14 09:47:44 UTC
(rev 30308)
+++ branches/render25/release/scripts/op/object.py 2010-07-14 10:02:43 UTC
(rev 30309)
@@ -113,25 +113,43 @@
return context.object
def execute(self, context):
-obj = context.object
+objs = context.selected_objects
+obj_act = context.object
+
+if context.object not in objs:
+objs.append(context.object)
+
+if not self.properties.extend:
+# for obj in objs:
+# obj.selected = False
+bpy.ops.object.select_all(action='DESELECT')
+
if self.properties.direction == 'PARENT':
-parent = obj.parent
-if not parent:
+parents = []
+for obj in objs:
+parent = obj.parent
+
+if parent:
+parents.append(parent)
+
+if obj_act == obj:
+context.scene.objects.active = parent
+
+parent.selected = True
+
+if parents:
return {'CANCELLED'}
-obj_act = parent
+
else:
-children = obj.children
-if len(children) != 1:
-return {'CANCELLED'}
-obj_act = children[0]
+children = []
+for obj in objs:
+children += list(obj.children)
+for obj_iter in children:
+obj_iter.selected = True
-if not self.properties.extend:
-# obj.selected = False
-bpy.ops.object.select_all(action='DESELECT')
+children.sort(key=lambda obj_iter: obj_iter.name)
+context.scene.objects.active = children[0]
-obj_act.selected = True
-context.scene.objects.active = obj_act
-
return {'FINISHED'}
Modified: branches/render25/release/scripts/ui/properties_physics_common.py
===
--- branches/render25/release/scripts/ui/properties_physics_common.py
2010-07-14 09:47:44 UTC (rev 30308)
+++ branches/render25/release/scripts/ui/properties_physics_common.py
2010-07-14 10:02:43 UTC (rev 30309)
@@ -46,7 +46,10 @@
split.prop(cache, name, text=File Name)
split.prop(cache, index, text=)
-layout.label(text=File Path:)
+row = layout.row()
+row.label(text=File Path:)
+row.prop(cache, use_library_path, Use Lib Path)
+
layout.prop(cache, filepath, text=)
layout.label(text=cache.info)
Modified: branches/render25/source/blender/blenkernel/intern/blender.c
===
--- branches/render25/source/blender/blenkernel/intern/blender.c
2010-07-14 09:47:44 UTC (rev 30308)
+++ branches/render25/source/blender/blenkernel/intern/blender.c
2010-07-14 10:02:43 UTC (rev 30309)
@@ -313,8 +313,6 @@
/* baseflags, groups, make depsgraph, etc */
set_scene_bg(CTX_data_scene(C));
-
- DAG_on_load_update();
MEM_freeN(bfd);
}
@@ -478,6 +476,9 @@
strcpy(G.sce, scestr);
G.fileflags= fileflags;
+ if(success)
+ DAG_on_load_update();
+
return success;
}
Modified: branches/render25/source/blender/blenkernel/intern/depsgraph.c
===
--- branches/render25/source/blender/blenkernel/intern/depsgraph.c
2010-07-14 09:47:44 UTC (rev 30308)
+++ branches/render25/source/blender/blenkernel/intern/depsgraph.c
2010-07-14 10:02:43 UTC (rev 30309)
@@ -2217,7 +2217,7 @@
*sce= bmain-scene.first;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30310] trunk/blender/source/blender/ blenlib/intern/path_util.c: Fix for #22818: blender doesn' t find a systemwide installed python.
Revision: 30310
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30310
Author: blendix
Date: 2010-07-14 12:44:34 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Fix for #22818: blender doesn't find a systemwide installed python.
What happens is that blender looks for a directory python in the same
place as the executable for local installations, but that also means when
you have /usr/bin/blender it will look for /usr/bin/python, which is an
executable. Now it checks if it is actually a directory and not a file.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/path_util.c
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2010-07-14
10:02:43 UTC (rev 30309)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2010-07-14
10:44:34 UTC (rev 30310)
@@ -747,7 +747,7 @@
ret = getenv(HOME);
if(ret) {
sprintf(dir, %s\\%s, ret, blender_version_decimal());
- if (BLI_exists(dir)) return dir;
+ if (BLI_is_dir(dir)) return dir;
}
/* else, check install dir (path containing blender.exe) */
@@ -755,7 +755,7 @@
if(BLI_getInstallationDir(dir))
{
sprintf(dir, %s, dir, blender_version_decimal());
- if (BLI_exists(dir)) return(dir);
+ if (BLI_is_dir(dir)) return(dir);
}
@@ -768,24 +768,24 @@
if (hResult == S_OK)
{
- if (BLI_exists(appdatapath)) { /* from fop, also
below... */
+ if (BLI_is_dir(appdatapath)) { /* from fop, also
below... */
sprintf(dir, %s\\Blender Foundation\\Blender,
appdatapath);
BLI_recurdir_fileops(dir);
- if (BLI_exists(dir)) {
+ if (BLI_is_dir(dir)) {
sprintf(dir,%s\\%s, dir,
blender_version_decimal());
- if(BLI_exists(dir)) return(dir);
+ if(BLI_is_dir(dir)) return(dir);
}
}
hResult = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA,
NULL, SHGFP_TYPE_CURRENT, appdatapath);
if (hResult == S_OK)
{
- if (BLI_exists(appdatapath))
+ if (BLI_is_dir(appdatapath))
{ /* from fop, also below... */
sprintf(dir, %s\\Blender
Foundation\\Blender, appdatapath);
BLI_recurdir_fileops(dir);
- if (BLI_exists(dir)) {
+ if (BLI_is_dir(dir)) {
sprintf(dir,%s\\%s, dir,
blender_version_decimal());
- if(BLI_exists(dir)) return(dir);
+ if(BLI_is_dir(dir)) return(dir);
}
}
}
@@ -809,7 +809,7 @@
BLI_make_file_string(/, targetpath, tmppath, folder_name);
- if (BLI_exists(targetpath)) {
+ if (BLI_is_dir(targetpath)) {
#ifdef PATH_DEBUG
printf(\tpath found: %s\n, targetpath);
#endif
@@ -932,7 +932,7 @@
BLI_make_file_string(/, targetpath, tmppath, folder_name);
- if (BLI_exists(targetpath)) {
+ if (BLI_is_dir(targetpath)) {
#ifdef PATH_DEBUG2
printf(\tpath found: %s\n, targetpath);
#endif
@@ -952,7 +952,7 @@
char *env = envvar?getenv(envvar):NULL;
if (!env) return 0;
- if (BLI_exists(env)) {
+ if (BLI_is_dir(env)) {
BLI_strncpy(path, env, FILE_MAX);
return 1;
} else {
@@ -1245,7 +1245,7 @@
a = strlen(dir);
#ifdef WIN32
- while(BLI_exists(dir) == 0){
+ while(BLI_is_dir(dir) == 0){
a --;
while(dir[a] != '\\'){
a--;
@@ -1259,7 +1259,7 @@
}
}
#else
- while(BLI_exist(dir) == 0){
+ while(BLI_is_dir(dir) == 0){
a --;
while(dir[a] != '/'){
a--;
@@ -1682,7 +1682,7 @@
{
fullname[0] = '\0';
- if (usertemp BLI_exists(U.tempdir)) {
+ if (usertemp BLI_is_dir(U.tempdir)) {
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30311] trunk/blender/source/blender: Fix a few compile warnings and rename gpu_buffers.h to GPU_buffers.h
Revision: 30311 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30311 Author: blendix Date: 2010-07-14 12:46:12 +0200 (Wed, 14 Jul 2010) Log Message: --- Fix a few compile warnings and rename gpu_buffers.h to GPU_buffers.h for consistency. Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c trunk/blender/source/blender/blenlib/intern/pbvh.c trunk/blender/source/blender/editors/sculpt_paint/sculpt.c trunk/blender/source/blender/editors/space_view3d/drawmesh.c trunk/blender/source/blender/gpu/intern/gpu_buffers.c trunk/blender/source/blender/gpu/intern/gpu_draw.c trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c Added Paths: --- trunk/blender/source/blender/gpu/GPU_buffers.h Removed Paths: - trunk/blender/source/blender/gpu/gpu_buffers.h Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c === --- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2010-07-14 10:44:34 UTC (rev 30310) +++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2010-07-14 10:46:12 UTC (rev 30311) @@ -59,7 +59,7 @@ #include BIF_gl.h #include BIF_glutil.h -#include gpu_buffers.h +#include GPU_buffers.h #include GPU_draw.h #include GPU_extensions.h #include GPU_material.h Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c === --- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2010-07-14 10:44:34 UTC (rev 30310) +++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2010-07-14 10:46:12 UTC (rev 30311) @@ -54,7 +54,7 @@ #include MEM_guardedalloc.h -#include gpu_buffers.h +#include GPU_buffers.h #include GPU_draw.h #include GPU_extensions.h #include GPU_material.h Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c === --- trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-07-14 10:44:34 UTC (rev 30310) +++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-07-14 10:46:12 UTC (rev 30311) @@ -32,7 +32,7 @@ #include BKE_mesh.h /* for mesh_calc_normals */ #include BKE_global.h /* for mesh_calc_normals */ -#include gpu_buffers.h +#include GPU_buffers.h #define LEAF_LIMIT 1 Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c === --- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14 10:44:34 UTC (rev 30310) +++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14 10:46:12 UTC (rev 30311) @@ -82,7 +82,7 @@ #include RE_render_ext.h -#include gpu_buffers.h +#include GPU_buffers.h #include math.h #include stdlib.h Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c === --- trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2010-07-14 10:44:34 UTC (rev 30310) +++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2010-07-14 10:46:12 UTC (rev 30311) @@ -62,7 +62,7 @@ #include UI_resources.h -#include gpu_buffers.h +#include GPU_buffers.h #include GPU_extensions.h #include GPU_draw.h Copied: trunk/blender/source/blender/gpu/GPU_buffers.h (from rev 30304, trunk/blender/source/blender/gpu/gpu_buffers.h) === --- trunk/blender/source/blender/gpu/GPU_buffers.h (rev 0) +++ trunk/blender/source/blender/gpu/GPU_buffers.h 2010-07-14 10:46:12 UTC (rev 30311) @@ -0,0 +1,178 @@ +/** + * $Id$ + * + * * BEGIN GPL LICENSE BLOCK * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. The Blender + * Foundation also sells licenses for use in proprietary software under + * the Blender License. See http://www.blender.org/BL/ for information + * about this. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2005 Blender Foundation. + * All rights
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30312] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint: * bug fix: [ and ] didn't resize unified size
Revision: 30312
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30312
Author: jwilkins
Date: 2010-07-14 12:54:42 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* bug fix: [ and ] didn't resize unified size
* quieted some warnings
Modified Paths:
--
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
===
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
2010-07-14 10:46:12 UTC (rev 30311)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
2010-07-14 10:54:42 UTC (rev 30312)
@@ -46,7 +46,6 @@
{
/*int type = RNA_enum_get(op-ptr, type);*/
Paint *paint = paint_get_active(CTX_data_scene(C));
- Sculpt *sd = CTX_data_tool_settings(C)-sculpt;
Brush *br = paint_brush(paint);
if (br)
@@ -59,13 +58,6 @@
return OPERATOR_FINISHED;
}
-static EnumPropertyItem brush_type_items[] = {
- {OB_MODE_SCULPT, SCULPT, ICON_SCULPTMODE_HLT, Sculpt, },
- {OB_MODE_VERTEX_PAINT, VERTEX_PAINT, ICON_VPAINT_HLT, Vertex Paint,
},
- {OB_MODE_WEIGHT_PAINT, WEIGHT_PAINT, ICON_WPAINT_HLT, Weight Paint,
},
- {OB_MODE_TEXTURE_PAINT, TEXTURE_PAINT, ICON_TPAINT_HLT, Texture
Paint, },
- {0, NULL, 0, NULL, NULL}};
-
void BRUSH_OT_add(wmOperatorType *ot)
{
/* identifiers */
@@ -78,10 +70,44 @@
/* flags */
ot-flag= OPTYPE_UNDO;
+}
- RNA_def_enum(ot-srna, type, brush_type_items, OB_MODE_VERTEX_PAINT,
Type, Which paint mode to create the brush for.);
+
+static int brush_scale_size_exec(bContext *C, wmOperator *op)
+{
+ /*int type = RNA_enum_get(op-ptr, type);*/
+ Paint *paint = paint_get_active(CTX_data_scene(C));
+ Brush *br = paint_brush(paint);
+ float factor = RNA_float_get(op-ptr, scalar);
+
+ if (br) {
+ if (U.sculpt_paint_settings SCULPT_PAINT_USE_UNIFIED_SIZE) {
+ U.sculpt_paint_unified_size *= factor;
+ }
+ else {
+ br-size *= factor;
+ }
+ }
+
+ return OPERATOR_FINISHED;
}
+void BRUSH_OT_scale_size(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot-name= Scale Brush Size;
+ ot-description= Change brush size by a scalar;
+ ot-idname= BRUSH_OT_scale_size;
+
+ /* api callbacks */
+ ot-exec= brush_scale_size_exec;
+
+ /* flags */
+ ot-flag= OPTYPE_UNDO;
+
+ RNA_def_float(ot-srna, scalar, 1, 0, 2, Factor, Factor to scale
brush size by, 0, 2);
+}
+
static int vertex_color_set_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
@@ -113,6 +139,7 @@
{
/* brush */
WM_operatortype_append(BRUSH_OT_add);
+ WM_operatortype_append(BRUSH_OT_scale_size);
WM_operatortype_append(BRUSH_OT_curve_preset);
@@ -187,16 +214,14 @@
static void ed_keymap_paint_brush_size(wmKeyMap *keymap, const char *path)
{
wmKeyMapItem *kmi;
-
- kmi= WM_keymap_add_item(keymap, WM_OT_context_scale_int,
LEFTBRACKETKEY, KM_PRESS, 0, 0);
- RNA_string_set(kmi-ptr, data_path, path);
- RNA_float_set(kmi-ptr, value, 0.9);
-
- kmi= WM_keymap_add_item(keymap, WM_OT_context_scale_int,
RIGHTBRACKETKEY, KM_PRESS, 0, 0);
- RNA_string_set(kmi-ptr, data_path, path);
- RNA_float_set(kmi-ptr, value, 10.0/9.0); // 1.
-}
+ kmi= WM_keymap_add_item(keymap, BRUSH_OT_scale_size, LEFTBRACKETKEY,
KM_PRESS, 0, 0);
+ RNA_float_set(kmi-ptr, scalar, 0.9);
+
+ kmi= WM_keymap_add_item(keymap, BRUSH_OT_scale_size, RIGHTBRACKETKEY,
KM_PRESS, 0, 0);
+ RNA_float_set(kmi-ptr, scalar, 10.0/9.0); // 1.
+}
+
void ED_keymap_paint(wmKeyConfig *keyconf)
{
wmKeyMap *keymap;
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 10:46:12 UTC (rev 30311)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-14 10:54:42 UTC (rev 30312)
@@ -3480,7 +3480,6 @@
Object *ob= CTX_data_active_object(C);
SculptSession *ss = ob-sculpt;
Sculpt *sd = CTX_data_tool_settings(C)-sculpt;
- Brush *brush = paint_brush(sd-paint);
(void)unused;
@@ -3492,7 +3491,7 @@
/* Finished */
if(ss-cache) {
sculpt_stroke_modifiers_check(C, ss);
-
+
/* Alt-Smooth */
if (ss-cache-alt_smooth) {
Paint *p=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30313] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/paint_ops.c: * minor correction
Revision: 30313 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30313 Author: jwilkins Date: 2010-07-14 12:55:37 +0200 (Wed, 14 Jul 2010) Log Message: --- * minor correction Modified Paths: -- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c === --- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c 2010-07-14 10:54:42 UTC (rev 30312) +++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c 2010-07-14 10:55:37 UTC (rev 30313) @@ -105,7 +105,7 @@ /* flags */ ot-flag= OPTYPE_UNDO; - RNA_def_float(ot-srna, scalar, 1, 0, 2, Factor, Factor to scale brush size by, 0, 2); + RNA_def_float(ot-srna, scalar, 1, 0, 2, Scalar, Factor to scale brush size by, 0, 2); } static int vertex_color_set_exec(bContext *C, wmOperator *op) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30314] trunk/blender/source/blender/ editors/animation/keyframing.c: Bugfix #22792: Blender crashes after inserting keyframe pressing I key
Revision: 30314
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30314
Author: aligorith
Date: 2010-07-14 13:03:07 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Bugfix #22792: Blender crashes after inserting keyframe pressing I key
Insert Keyframe function was not checking that an ID-block was given before
trying to resolve the RNA-path using it.
Modified Paths:
--
trunk/blender/source/blender/editors/animation/keyframing.c
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===
--- trunk/blender/source/blender/editors/animation/keyframing.c 2010-07-14
10:55:37 UTC (rev 30313)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2010-07-14
11:03:07 UTC (rev 30314)
@@ -817,15 +817,21 @@
short insert_keyframe (ID *id, bAction *act, const char group[], const char
rna_path[], int array_index, float cfra, short flag)
{
PointerRNA id_ptr, ptr;
- PropertyRNA *prop;
+ PropertyRNA *prop = NULL;
FCurve *fcu;
int array_index_max= array_index+1;
int ret= 0;
/* validate pointer first - exit if failure */
+ if (id == NULL) {
+ printf(Insert Key: no ID-block to insert keyframe in (Path =
%s) \n, rna_path);
+ return 0;
+ }
+
RNA_id_pointer_create(id, id_ptr);
if ((RNA_path_resolve(id_ptr, rna_path, ptr, prop) == 0) || (prop ==
NULL)) {
- printf(Insert Key: Could not insert keyframe, as RNA Path is
invalid for the given ID (ID = %s, Path = %s)\n, id-name, rna_path);
+ printf(Insert Key: Could not insert keyframe, as RNA Path is
invalid for the given ID (ID = %s, Path = %s)\n,
+ (id)? id-name : Missing ID-Block, rna_path);
return 0;
}
@@ -922,7 +928,7 @@
if ELEM(NULL, id, adt) {
printf(ERROR: no ID-block and/or AnimData to delete keyframe
from \n);
return 0;
- }
+ }
/* validate pointer first - exit if failure */
RNA_id_pointer_create(id, id_ptr);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30315] trunk/blender/source/blender/ makesrna/intern/rna_space.c: DopeSheet: Commented out menu entry for ' Grease Pencil' mode for now, since I don'
Revision: 30315
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30315
Author: aligorith
Date: 2010-07-14 13:07:30 +0200 (Wed, 14 Jul 2010)
Log Message:
---
DopeSheet: Commented out menu entry for 'Grease Pencil' mode for now, since I
don't have time to restore this now (i.e. in time for 2.53). It will come back
some day, but just probably not for another few months.
Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_space.c2010-07-14
11:03:07 UTC (rev 30314)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c2010-07-14
11:07:30 UTC (rev 30315)
@@ -1595,8 +1595,8 @@
static EnumPropertyItem mode_items[] = {
{SACTCONT_DOPESHEET, DOPESHEET, 0, DopeSheet, },
{SACTCONT_ACTION, ACTION, 0, Action Editor, },
- {SACTCONT_SHAPEKEY, SHAPEKEY, 0, ShapeKey Editor, }, //
XXX to be depreceated?
- {SACTCONT_GPENCIL, GPENCIL, 0, Grease Pencil, },
+ {SACTCONT_SHAPEKEY, SHAPEKEY, 0, ShapeKey Editor, },
+ //{SACTCONT_GPENCIL, GPENCIL, 0, Grease Pencil, }, //
XXX: to be reimplemented, but not enough time before 2.53 - Aligorith, 2010Jul14
{0, NULL, 0, NULL, NULL}};
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30316] branches/soc-2010-jwilkins/release /scripts/ui: * moved 'fast_navigate' from user prefs to multires modifier panel
Revision: 30316
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30316
Author: jwilkins
Date: 2010-07-14 13:32:13 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* moved 'fast_navigate' from user prefs to multires modifier panel
Modified Paths:
--
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
2010-07-14 11:07:30 UTC (rev 30315)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
2010-07-14 11:32:13 UTC (rev 30316)
@@ -334,7 +334,6 @@
col.prop(edit, sculpt_paint_use_unified_strength, text=Unify
Strength)
col.prop(edit, sculpt_paint_overlay_col, text=Overlay Color)
col.prop(sculpt, use_openmp, text=Threaded Sculpt)
-col.prop(sculpt, fast_navigate)
col.prop(sculpt, show_brush)
row = col.row()
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 11:07:30 UTC (rev 30315)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-14 11:32:13 UTC (rev 30316)
@@ -638,7 +638,8 @@
row.prop(brush, sculpt_plane, text=)
-if brush.sculpt_tool in ('CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL',
'SCRAPE'):
+#if brush.sculpt_tool in ('CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL',
'SCRAPE'):
+if brush.sculpt_tool in ('CLAY', 'FLATTEN', 'FILL', 'SCRAPE'):
row = col.row(align=True)
row.prop(brush, plane_offset, slider=True)
row.prop(brush, use_offset_pressure, text=)
@@ -656,7 +657,8 @@
row= col.row()
row.prop(brush, use_frontface, text=Front Faces Only)
-if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'LAYER',
'CLAY', 'CLAY_TUBES'):
+#if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'LAYER',
'CLAY', 'CLAY_TUBES'):
+if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'LAYER',
'CLAY'):
col.separator()
col.row().prop(brush, direction, expand=True)
elif brush.sculpt_tool in ('FLATTEN'):
@@ -677,7 +679,8 @@
-if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'INFLATE',
'LAYER', 'CLAY', 'CLAY_TUBES'):
+#if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'INFLATE',
'LAYER', 'CLAY', 'CLAY_TUBES'):
+if brush.sculpt_tool in ('DRAW', 'CREASE', 'BLOB', 'INFLATE',
'LAYER', 'CLAY'):
col.separator()
col.prop(brush, use_accumulate)
@@ -1108,7 +,8 @@
col = layout.column();
if context.sculpt_object and context.tool_settings.sculpt:
-if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'CLAY_TUBES',
'PINCH', 'CREASE', 'BLOB', 'FLATTEN'):
+#if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'CLAY_TUBES',
'PINCH', 'CREASE', 'BLOB', 'FLATTEN'):
+if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'PINCH',
'CREASE', 'BLOB', 'FLATTEN'):
col.prop(brush, add_col, text=Add Color)
col.prop(brush, sub_col, text=Substract Color)
else:
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30317] branches/soc-2010-jwilkins/release /scripts/ui/properties_data_modifier.py: * moved 'fast_navigate' from user prefs to multires modifier panel
Revision: 30317 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30317 Author: jwilkins Date: 2010-07-14 13:32:55 +0200 (Wed, 14 Jul 2010) Log Message: --- * moved 'fast_navigate' from user prefs to multires modifier panel Modified Paths: -- branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py Modified: branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py === --- branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py 2010-07-14 11:32:13 UTC (rev 30316) +++ branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py 2010-07-14 11:32:55 UTC (rev 30317) @@ -437,6 +437,7 @@ col.prop(md, levels, text=Preview) col.prop(md, sculpt_levels, text=Sculpt) col.prop(md, render_levels, text=Render) +col.prop(bpy.context.tool_settings.sculpt, fast_navigate) if wide_ui: col = split.column() ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30318] branches/soc-2010-jwilkins/release /scripts/ui/space_userpref.py: * put 'Overlay Color:' label to left of color.
Revision: 30318 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30318 Author: jwilkins Date: 2010-07-14 13:44:05 +0200 (Wed, 14 Jul 2010) Log Message: --- * put 'Overlay Color:' label to left of color. It needs to be made narrower though Modified Paths: -- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py === --- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py 2010-07-14 11:32:55 UTC (rev 30317) +++ branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py 2010-07-14 11:44:05 UTC (rev 30318) @@ -332,7 +332,9 @@ col.label(text=Paint and Sculpt:) col.prop(edit, sculpt_paint_use_unified_size, text=Unify Size) col.prop(edit, sculpt_paint_use_unified_strength, text=Unify Strength) -col.prop(edit, sculpt_paint_overlay_col, text=Overlay Color) +row = col.row(align=True) +row.label(Overlay Color:) +row.prop(edit, sculpt_paint_overlay_col, text=) col.prop(sculpt, use_openmp, text=Threaded Sculpt) col.prop(sculpt, show_brush) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30319] branches/soc-2010-jwilkins: *** DO NOT DISTRIBUTE THIS VERSION ***
Revision: 30319
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30319
Author: jwilkins
Date: 2010-07-14 13:56:05 +0200 (Wed, 14 Jul 2010)
Log Message:
---
*** DO NOT DISTRIBUTE THIS VERSION ***
Clay brush is disabled and On-Surface Brush is removed.
This version created for merging with the trunk.
Next version will revert to previous version.
Modified Paths:
--
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/intern/ghost/SConscript
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/makesrna/SConscript
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/windowmanager/SConscript
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 11:44:05 UTC (rev
30318)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 11:56:05 UTC (rev
30319)
@@ -117,7 +117,6 @@
OPTION(WITH_RAYOPTIMIZATION Enable use of SIMD (SSE) optimizations for the
raytracer ON)
OPTION(WITH_CXX_GUARDEDALLOC Enable GuardedAlloc for C++ memory allocation
tracking OFF)
OPTION(WITH_INSTALL Install accompanying scripts and language files
needed to run blender ON)
-OPTION(WITH_ONSURFACEBRUSH Enable use of the 'on-surface brush' for
paint/sculpt. Requires a stencil buffer, GL_depth_texture, and GLSL ON)
IF(APPLE)
OPTION(WITH_COCOA Use Cocoa framework instead of deprecated
Carbon ON)
@@ -318,10 +317,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
SET(PLATFORM_LINKFLAGS -pthread)
# Better warnings
@@ -411,10 +406,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
IF(MSVC)
IF(CMAKE_CL_64)
SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -823,10 +814,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
SET(EXETYPE MACOSX_BUNDLE)
SET(CMAKE_C_FLAGS_DEBUG -fno-strict-aliasing -g)
Modified: branches/soc-2010-jwilkins/intern/ghost/SConscript
===
--- branches/soc-2010-jwilkins/intern/ghost/SConscript 2010-07-14 11:44:05 UTC
(rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/SConscript 2010-07-14 11:56:05 UTC
(rev 30319)
@@ -57,9 +57,6 @@
if env['BF_GHOST_DEBUG']:
defs.append('BF_GHOST_DEBUG')
-if env['WITH_BF_ONSURFACEBRUSH']:
- defs.append('WITH_ONSURFACEBRUSH')
-
incs = '. ../string #extern/glew/include #source/blender/imbuf
#source/blender/makesdna ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross',
'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
===
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-07-14 11:56:05 UTC (rev 30319)
@@ -47,9 +47,6 @@
AGL_DOUBLEBUFFER,
AGL_ACCELERATED,
AGL_DEPTH_SIZE,32,
-#ifdef WITH_ONSURFACEBRUSH
-AGL_STENCIL_SIZE,8,
-#endif
AGL_NONE,
};
@@ -59,9 +56,6 @@
AGL_ACCELERATED,
AGL_FULLSCREEN,
AGL_DEPTH_SIZE,32,
-#ifdef WITH_ONSURFACEBRUSH
-AGL_STENCIL_SIZE,8,
-#endif
AGL_NONE,
};
Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30320] trunk/blender/release/scripts: bugfix [#22843] Cannot export to folder with .blend on the end.
Revision: 30320 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30320 Author: campbellbarton Date: 2010-07-14 13:58:19 +0200 (Wed, 14 Jul 2010) Log Message: --- bugfix [#22843] Cannot export to folder with .blend on the end. Modified Paths: -- trunk/blender/release/scripts/io/export_3ds.py trunk/blender/release/scripts/io/export_fbx.py trunk/blender/release/scripts/io/export_mdd.py trunk/blender/release/scripts/io/export_obj.py trunk/blender/release/scripts/io/export_ply.py trunk/blender/release/scripts/io/export_x3d.py trunk/blender/release/scripts/op/object.py trunk/blender/release/scripts/op/uv.py Modified: trunk/blender/release/scripts/io/export_3ds.py === --- trunk/blender/release/scripts/io/export_3ds.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_3ds.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -1140,7 +1140,7 @@ # Add to a menu def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .3ds) +default_path = os.path.splitext(bpy.data.filepath)[0] + .3ds self.layout.operator(Export3DS.bl_idname, text=3D Studio (.3ds)).filepath = default_path @@ -1154,4 +1154,3 @@ if __name__ == __main__: register() - Modified: trunk/blender/release/scripts/io/export_fbx.py === --- trunk/blender/release/scripts/io/export_fbx.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_fbx.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -3437,7 +3437,7 @@ def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .fbx) +default_path = os.path.splitext(bpy.data.filepath)[0] + .fbx self.layout.operator(ExportFBX.bl_idname, text=Autodesk FBX (.fbx)).filepath = default_path Modified: trunk/blender/release/scripts/io/export_mdd.py === --- trunk/blender/release/scripts/io/export_mdd.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_mdd.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -183,7 +183,8 @@ def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .mdd) +import os +default_path = os.path.splitext(bpy.data.filepath)[0] + .mdd self.layout.operator(ExportMDD.bl_idname, text=Lightwave Point Cache (.mdd)).filepath = default_path Modified: trunk/blender/release/scripts/io/export_obj.py === --- trunk/blender/release/scripts/io/export_obj.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_obj.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -964,7 +964,7 @@ def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .obj) +default_path = os.path.splitext(bpy.data.filepath)[0] + .obj self.layout.operator(ExportOBJ.bl_idname, text=Wavefront (.obj)).filepath = default_path Modified: trunk/blender/release/scripts/io/export_ply.py === --- trunk/blender/release/scripts/io/export_ply.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_ply.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -310,7 +310,8 @@ def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .ply) +import os +default_path = os.path.splitext(bpy.data.filepath)[0] + .ply self.layout.operator(ExportPLY.bl_idname, text=Stanford (.ply)).filepath = default_path Modified: trunk/blender/release/scripts/io/export_x3d.py === --- trunk/blender/release/scripts/io/export_x3d.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/io/export_x3d.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -1242,7 +1242,7 @@ def menu_func(self, context): -default_path = bpy.data.filepath.replace(.blend, .x3d) +default_path = os.path.splitext(bpy.data.filepath)[0] + .x3d self.layout.operator(ExportX3D.bl_idname, text=X3D Extensible 3D (.x3d)).filepath = default_path @@ -1259,4 +1259,3 @@ if __name__ == __main__: register() - Modified: trunk/blender/release/scripts/op/object.py === --- trunk/blender/release/scripts/op/object.py 2010-07-14 11:56:05 UTC (rev 30319) +++ trunk/blender/release/scripts/op/object.py 2010-07-14 11:58:19 UTC (rev 30320) @@ -131,11 +131,11 @@ if parent: parents.append(parent) - -if obj_act == obj: -context.scene.objects.active = parent -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30321] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: bugfix [#22847] 18+ char Name in Edit Strip causes errors when duplicating strips
Revision: 30321
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30321
Author: campbellbarton
Date: 2010-07-14 14:16:23 +0200 (Wed, 14 Jul 2010)
Log Message:
---
bugfix [#22847] 18+ char Name in Edit Strip causes errors when duplicating
strips
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/sequencer.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-07-14
11:58:19 UTC (rev 30320)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-07-14
12:16:23 UTC (rev 30321)
@@ -795,7 +795,7 @@
Sequence *seq;
for(seq=seqbasep-first; seq; seq= seq-next) {
if (sui-seq != seq strcmp(sui-name_dest, seq-name+2)==0) {
- sprintf(sui-name_dest, %.18s.%03d, sui-name_src,
sui-count++);
+ sprintf(sui-name_dest, %.17s.%03d, sui-name_src,
sui-count++); /*24 - 2 for prefix, -1 for \0 */
sui-match= 1; /* be sure to re-scan */
}
}
@@ -816,12 +816,17 @@
strcpy(sui.name_src, seq-name+2);
strcpy(sui.name_dest, seq-name+2);
+ sui.count= 1;
+ sui.match= 1; /* assume the worst to start the loop */
+
/* Strip off the suffix */
- if ((dot=strrchr(sui.name_src, '.')))
+ if ((dot=strrchr(sui.name_src, '.'))) {
*dot= '\0';
+ dot++;
- sui.count= 1;
- sui.match= 1; /* assume the worst to start the loop */
+ if(*dot)
+ sui.count= atoi(dot) + 1;
+ }
while(sui.match) {
sui.match= 0;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30322] branches/soc-2010-nexyon/intern/ audaspace: Python API:
Revision: 30322
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30322
Author: nexyon
Date: 2010-07-14 14:35:55 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Python API:
* PEP8 fixes for aud.
* Correction of doc strings.
Modified Paths:
--
branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2010-nexyon/intern/audaspace/intern/AUD_C-API.cpp
Modified: branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
===
--- branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
2010-07-14 12:16:23 UTC (rev 30321)
+++ branches/soc-2010-nexyon/intern/audaspace/Python/AUD_PyAPI.cpp
2010-07-14 12:35:55 UTC (rev 30322)
@@ -113,108 +113,159 @@
return (PyObject *)self;
}
+PyDoc_STRVAR(M_aud_Sound_sine_doc,
+Creates a sine sound at a specific frequency.);
+
static PyObject *
Sound_sine(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_file_doc,
+Creates a sound object of a sound file.);
+
static PyObject *
Sound_file(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_lowpass_doc,
+Creates a lowpass filter with a specific cut off
frequency.);
+
static PyObject *
Sound_lowpass(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_delay_doc,
+Delays a sound by a specific amount of seconds.);
+
static PyObject *
Sound_delay(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_double_doc,
+Plays two sounds of the same specs in sequence.);
+
static PyObject *
Sound_double(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_highpass_doc,
+Creates a highpass filter with a specific cut off
frequency.);
+
static PyObject *
Sound_highpass(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_limiter_doc,
+Limits a sound within a specific start and end
time.);
+
static PyObject *
Sound_limiter(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_pitch_doc,
+Changes the pitch of a sound with a specific
factor.);
+
static PyObject *
Sound_pitch(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_volume_doc,
+Changes the volume of a sound with a specific
factor.);
+
static PyObject *
Sound_volume(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_fadein_doc,
+Fades a sound in from a specific start time and with
a specific length.);
+
static PyObject *
Sound_fadein(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_fadeout_doc,
+Fades a sound out from a specific start time and with
a specific length.);
+
static PyObject *
Sound_fadeout(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_loop_doc,
+Loops a sound a specific amount of times, negative
values mean endlessly.);
+
static PyObject *
Sound_loop(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_superpose_doc,
+Mixes two sounds of the same specs.);
+
static PyObject *
Sound_superpose(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_pingpong_doc,
+Plays a sound forward and then backward.);
+
static PyObject *
Sound_pingpong(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_reverse_doc,
+Plays a sound reversed.);
+
static PyObject *
Sound_reverse(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_buffer_doc,
+Buffers a sound into RAM.);
+
static PyObject *
Sound_buffer(PyObject* nothing, PyObject* args);
+PyDoc_STRVAR(M_aud_Sound_square_doc,
+Makes a square wave out of an audio wave depending on
a threshold value.);
+
static PyObject *
Sound_square(PyObject* nothing, PyObject* args);
static PyMethodDef Sound_methods[] = {
{sine, (PyCFunction)Sound_sine, METH_VARARGS | METH_STATIC,
-Creates a sine sound at a specific frequency.
+M_aud_Sound_sine_doc
},
{file, (PyCFunction)Sound_file, METH_VARARGS | METH_STATIC,
-Creates a sound object of a sound file.
+M_aud_Sound_file_doc
},
{lowpass, (PyCFunction)Sound_lowpass, METH_VARARGS | METH_STATIC,
-Creates a lowpass filter with a specific cut off frequency.
+M_aud_Sound_lowpass_doc
},
{delay, (PyCFunction)Sound_delay, METH_VARARGS | METH_STATIC,
-Delays a sound by a specific amount of seconds.
+M_aud_Sound_delay_doc
},
{double, (PyCFunction)Sound_double, METH_VARARGS | METH_STATIC,
-Plays two sounds of the same specs in sequence.
+M_aud_Sound_double_doc
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30325] trunk/blender: Merge GSOC Sculpt Branch: 28499-30319
Revision: 30325
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30325
Author: jwilkins
Date: 2010-07-14 16:11:03 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Merge GSOC Sculpt Branch: 28499-30319
https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins
See log of that branch for details.
Modified Paths:
--
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/BKE_brush.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/icons.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesdna/DNA_color_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
---
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
Property Changed:
trunk/blender/release/scripts/io/import_scene_3ds.py
trunk/blender/release/scripts/ui/properties_data_curve.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_physics_cloth.py
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/release/scripts/ui/properties_physics_softbody.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_userpref.py
Modified: trunk/blender/intern/ghost/SConscript
===
--- trunk/blender/intern/ghost/SConscript 2010-07-14 13:20:13 UTC (rev
30324)
+++ trunk/blender/intern/ghost/SConscript 2010-07-14 14:11:03 UTC (rev
30325)
@@ -56,9 +56,8 @@
if env['BF_GHOST_DEBUG']:
defs.append('BF_GHOST_DEBUG')
-
+
incs = '. ../string #extern/glew/include #source/blender/imbuf
#source/blender/makesdna ' + env['BF_OPENGL_INC']
if
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30326] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: Fix compile error after merge, gpu_buffers.h - GPU_buffers.h.
Revision: 30326 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30326 Author: blendix Date: 2010-07-14 16:31:27 +0200 (Wed, 14 Jul 2010) Log Message: --- Fix compile error after merge, gpu_buffers.h - GPU_buffers.h. Modified Paths: -- trunk/blender/source/blender/gpu/intern/gpu_draw.c Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c === --- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2010-07-14 14:11:03 UTC (rev 30325) +++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2010-07-14 14:31:27 UTC (rev 30326) @@ -69,7 +69,6 @@ #include GPU_draw.h #include GPU_extensions.h #include GPU_material.h -#include gpu_buffers.h #include smoke_API.h ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30327] trunk/blender/release/scripts/ modules/console/complete_calltip.py: fix for autocomp., was raising an error when autocompleating functions def
Revision: 30327 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30327 Author: campbellbarton Date: 2010-07-14 16:56:33 +0200 (Wed, 14 Jul 2010) Log Message: --- fix for autocomp., was raising an error when autocompleating functions defined in the console because their file wasnt found (which is correct in this case). Modified Paths: -- trunk/blender/release/scripts/modules/console/complete_calltip.py Modified: trunk/blender/release/scripts/modules/console/complete_calltip.py === --- trunk/blender/release/scripts/modules/console/complete_calltip.py 2010-07-14 14:31:27 UTC (rev 30326) +++ trunk/blender/release/scripts/modules/console/complete_calltip.py 2010-07-14 14:56:33 UTC (rev 30327) @@ -124,7 +124,7 @@ if source is None: try: source = inspect.getsource(func) -except TypeError: +except (TypeError, IOError): source = '' if source: match = re.search(DEF_SOURCE % func_name, source, RE_FLAG) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30328] branches/soc-2010-jwilkins: == Working Version ==
Revision: 30328 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30328 Author: jwilkins Date: 2010-07-14 17:17:59 +0200 (Wed, 14 Jul 2010) Log Message: --- == Working Version == * Had to remake some changes I made to scons files due to moved files. Modified Paths: -- branches/soc-2010-jwilkins/CMakeLists.txt branches/soc-2010-jwilkins/build_files/scons/config/darwin-config.py branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py branches/soc-2010-jwilkins/build_files/scons/config/linuxcross-config.py branches/soc-2010-jwilkins/build_files/scons/config/win32-mingw-config.py branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py branches/soc-2010-jwilkins/build_files/scons/config/win64-vc-config.py branches/soc-2010-jwilkins/build_files/scons/tools/btools.py branches/soc-2010-jwilkins/intern/ghost/SConscript branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c branches/soc-2010-jwilkins/source/blender/makesrna/SConscript branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c branches/soc-2010-jwilkins/source/blender/windowmanager/SConscript branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c Modified: branches/soc-2010-jwilkins/CMakeLists.txt === --- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 14:56:33 UTC (rev 30327) +++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 15:17:59 UTC (rev 30328) @@ -117,6 +117,7 @@ OPTION(WITH_RAYOPTIMIZATION Enable use of SIMD (SSE) optimizations for the raytracer ON) OPTION(WITH_CXX_GUARDEDALLOC Enable GuardedAlloc for C++ memory allocation tracking OFF) OPTION(WITH_INSTALL Install accompanying scripts and language files needed to run blender ON) +OPTION(WITH_ONSURFACEBRUSH Enable use of the 'on-surface brush' for paint/sculpt. Requires a stencil buffer, GL_depth_texture, and GLSL ON) IF(APPLE) OPTION(WITH_COCOA Use Cocoa framework instead of deprecated Carbon ON) @@ -317,6 +318,10 @@ ADD_DEFINITIONS(-D__MMX__) ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) + IF(WITH_ONSURFACEBRUSH) + ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH) + ENDIF(WITH_ONSURFACEBRUSH) + SET(PLATFORM_LINKFLAGS -pthread) # Better warnings @@ -406,6 +411,10 @@ ADD_DEFINITIONS(-D__MMX__) ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) + IF(WITH_ONSURFACEBRUSH) + ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH) + ENDIF(WITH_ONSURFACEBRUSH) + IF(MSVC) IF(CMAKE_CL_64) SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 ) @@ -814,6 +823,10 @@ ADD_DEFINITIONS(-D__MMX__) ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) + IF(WITH_ONSURFACEBRUSH) + ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH) + ENDIF(WITH_ONSURFACEBRUSH) + SET(EXETYPE MACOSX_BUNDLE) SET(CMAKE_C_FLAGS_DEBUG -fno-strict-aliasing -g) Modified: branches/soc-2010-jwilkins/build_files/scons/config/darwin-config.py === --- branches/soc-2010-jwilkins/build_files/scons/config/darwin-config.py 2010-07-14 14:56:33 UTC (rev 30327) +++ branches/soc-2010-jwilkins/build_files/scons/config/darwin-config.py 2010-07-14 15:17:59 UTC (rev 30328) @@ -264,8 +264,10 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] elif MACOSX_ARCHITECTURE == 'x86_64': BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2'] - +#On-Surface Brush +WITH_BF_ONSURFACEBRUSH = True + # ### various compile settings and flags## # Modified: branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py === --- branches/soc-2010-jwilkins/build_files/scons/config/linux2-config.py 2010-07-14 14:56:33 UTC (rev 30327) +++
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30329] trunk/blender/SConstruct: Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'.
Revision: 30329 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30329 Author: jesterking Date: 2010-07-14 18:38:09 +0200 (Wed, 14 Jul 2010) Log Message: --- Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'. This fixes problem after change to this new location, but with .pyc files still lingering in old tools/ directory that still got imported due to syspath form. Modified Paths: -- trunk/blender/SConstruct Modified: trunk/blender/SConstruct === --- trunk/blender/SConstruct2010-07-14 15:17:59 UTC (rev 30328) +++ trunk/blender/SConstruct2010-07-14 16:38:09 UTC (rev 30329) @@ -47,19 +47,18 @@ from tempfile import mkdtemp # needed for importing tools -sys.path.append(os.path.join(., build_files, scons)) +sys.path.append(os.path.join(., build_files, scons, tools)) -import tools.Blender -import tools.btools -import tools.bcolors +import Blender +import btools +import bcolors EnsureSConsVersion(1,0,0) -BlenderEnvironment = tools.Blender.BlenderEnvironment -btools = tools.btools -B = tools.Blender +BlenderEnvironment = Blender.BlenderEnvironment +B = Blender -VERSION = tools.btools.VERSION # This is used in creating the local config directories +VERSION = btools.VERSION # This is used in creating the local config directories ### globals ### platform = sys.platform ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30330] branches/soc-2010-leifandersen/ tests: 1.
Revision: 30330
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30330
Author: leifandersen
Date: 2010-07-14 18:41:44 +0200 (Wed, 14 Jul 2010)
Log Message:
---
1. Changed the CMake files to match the new format.
2. Cleaned up more code, so that it goes down for distinct branches
(well...six, maybe I can clean up some more), being: Images (w, w/o
animations), Hashcodes (w, w/o animations), and those too options again with
user defined paths. Although the hashcode paths are currently stuck off, and
may or may not actually make it into the mid-term evaulations. Most of the
bugs are removed at this point.
Modified Paths:
--
branches/soc-2010-leifandersen/tests/pyunit/ops/physics/CMakeLists.txt
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/tests/pyunit/ops/physics/CMakeLists.txt
===
--- branches/soc-2010-leifandersen/tests/pyunit/ops/physics/CMakeLists.txt
2010-07-14 16:38:09 UTC (rev 30329)
+++ branches/soc-2010-leifandersen/tests/pyunit/ops/physics/CMakeLists.txt
2010-07-14 16:41:44 UTC (rev 30330)
@@ -4,7 +4,7 @@
PROPERTIES PASS_REGULAR_EXPRESSION OK
)
-ADD_TEST(Ops_Particle_Test_Image_Compare python
${Blender_BINARY_DIR}/tests/render/run.py --blender-bin
${Blender_BINARY_DIR}/bin/blender --image
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair.blend --image
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_group.blend --image
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_object.blend)
+ADD_TEST(Ops_Particle_Test_Image_Compare python
${Blender_BINARY_DIR}/tests/render/run.py --blender-bin
${Blender_BINARY_DIR}/bin/blender --image
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair.blend
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_group.blend
${Blender_BINARY_DIR}/tests/pyunit/ops/physics/cube_hair_object.blend)
SET_TESTS_PROPERTIES(Ops_Particle_Test_Image_Compare
PROPERTIES PASS_REGULAR_EXPRESSION All tests passed
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 16:38:09 UTC
(rev 30329)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 16:41:44 UTC
(rev 30330)
@@ -12,27 +12,9 @@
from optparse import OptionParser
BLENDER_BIN = 'blender'
-RUN_ANIMATIONS = False
-RUN_IMAGES = True
-RUN_ANIMATIONS = False
-VERBOSE = False
-SAVEOUT = sys.stdout
-BLEND_FILE_FOLDER = os.path.join(sys.path[0])
-ANIM_BLEND_FILE_FOLDER = os.path.join(sys.path[0], 'anim')
-GOOD_FOLDER = os.path.join(sys.path[0], 'render')
-ANIM_GOOD_FOLDER = os.path.join(sys.path[0], 'anim')
-OUTPUT_FOLDER = os.path.join(sys.path[0], 'output')
-ANIM_OUTPUT_FOLDER = os.path.join(sys.path[0], 'output')
-HTML_OUTPUT = sys.path[0]
GOOD_BLENDER_BIN = 'blender'
-BUILDING_TESTS = False
-HASHCODE_TEST = False
-HASHCODE_FILE = os.path.join(sys.path[0], 'hashcodes.txt')
-GET_HASHCODES = False
-OPTIONAL_CASES = []
+VERBOSE = False
-HELP = '''Help to come'''
-
class ImageTestCase:
'''A Render Test Case. Steps must be run in order:
1. Constructer
@@ -86,8 +68,9 @@
try:
self.good_image = Image.open(good_path)
except IOError:
-self.mode = 'Fail'
+self.passed = False
self.good_image = None
+self.messaged = 'Failed to find good image'
def generate_hash(self, image):
hash = 0
@@ -119,7 +102,6 @@
self.test_image = Image.open(self.test_path)
self.test_hash = self.generate_hash(self.test_image)
except IOError:
-self.ID = 'Fail'
self.test_image = None
self.passed = False
self.pixel_range = 0
@@ -150,13 +132,6 @@
else:
self.passed = False
return self.passed
-elif self.good_hash != None and self.test_hash != None:
-self.diff_hash = abs(self.good_hash - self.test_hash)
-if self.diff_hash 1000:
-self.passed = True
-else:
-self.passed = False
-return self.passed
def hash_test(self):
if self.test_image == None:
@@ -457,11 +432,11 @@
file.close()
return cases
-def console_output(cases):
+def console_output(cases, building_tests, get_hashcodes):
'''Displays the final output to the console. The output that will be
shown if the -v flag isn't used'''
failed = []
print ''
-if BUILDING_TESTS:
+if building_tests:
print Tests built successfully
return
@@ -469,7 +444,7 @@
if test_case.passed == False:
failed.append(test_case)
-if GET_HASHCODES:
+if get_hashcodes:
for case in cases:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30331] branches/soc-2010-leifandersen/ tests/render/run.py: 1.
Revision: 30331
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30331
Author: leifandersen
Date: 2010-07-14 19:22:36 +0200 (Wed, 14 Jul 2010)
Log Message:
---
1. Fixed a major bug causing all animation tests to crash that cropped up in
thee refactoring.
2. Changed the outputted HTML to make it cleaner.
Modified Paths:
--
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 16:41:44 UTC
(rev 30330)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 17:22:36 UTC
(rev 30331)
@@ -316,7 +316,7 @@
self.bad_pixels = self.bad_pixels_arr[0]
self.pixel_range = self.pixel_range_arr[0]
self.pixel_count = 0
-for num in self.pixel_count:
+for num in self.pixel_count_arr:
self.pixel_count+=num
self.passed = True
@@ -454,7 +454,7 @@
print test_case.name
else:
print All tests passed
-if len(failed) == len(cases):
+if len(failed) == len(cases) and len(cases) != 0:
print ''
print It is possible that the tests have not been built, if so
print Please build tests by running: python run.py --build-tests
@@ -557,8 +557,7 @@
file.write('div class=document\n')
file.write('div id=pageheader/div\n')
file.write('div class=documentwrapper\ndiv class=bodywrapper\ndiv
class=body\n')
-file.write('h1Images/h1\n')
-file.write('h2Failed Images/h2\n')
+file.write('h1Animation:' + animation.name + '/h1\n')
file.write('table border=1\n')
file.write('tr\n')
file.write('thFilename/th\n')
@@ -571,7 +570,7 @@
i = 1
for frame in animation.diff_animation:
file.write('tr\n')
-file.write('td' + animation.name + str(i) + '/td\n')
+file.write('td Frame: ' + str(i) + '/td\n')
file.write('tda href=' + animation.good_path_arr[i-1] + 'img
src=' + animation.good_path_arr[i-1] + ' alt=Good Image width=200
height=150/a/td\n')
file.write('tda href=' + animation.test_path_arr[i-1] + 'img
src=' + animation.test_path_arr[i-1] + ' alt=Latest Render width=200
height=150/a/td\n')
file.write('tda href=' + animation.diff_path_arr[i-1] + 'img
src=' + animation.diff_path_arr[i-1] + ' alt=Image Diff width=200
height=150/a/td\n')
@@ -633,7 +632,7 @@
GOOD_FOLDER = ''
ANIM_OUTPUT_FOLDER = ANIM_GOOD_FOLDER
ANIM_GOOD_FOLDER = ''
-
+
for arg in args:
(directory, file) = os.path.split(arg)
if options.image:
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30332] trunk/blender/source/blender/ editors/sculpt_paint/sculpt_undo.c: SVN maintenance.
Revision: 30332
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30332
Author: gsrb3d
Date: 2010-07-14 19:27:56 +0200 (Wed, 14 Jul 2010)
Log Message:
---
SVN maintenance.
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
Property Changed:
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
2010-07-14 17:22:36 UTC (rev 30331)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
2010-07-14 17:27:56 UTC (rev 30332)
@@ -1,302 +1,302 @@
-/*
- * $Id: sculpt.c 29425 2010-06-12 15:05:19Z jwilkins $
- *
- * * BEGIN GPL LICENSE BLOCK *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2006 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * * END GPL LICENSE BLOCK *
- *
- * Implements the Sculpt Mode tools
- *
- */
-
-#include BLI_math.h
-#include BLI_ghash.h
-#include BLI_threads.h
-
-#include DNA_meshdata_types.h
-#include DNA_object_types.h
-#include DNA_scene_types.h
-#include DNA_mesh_types.h
-#include DNA_key_types.h
-
-#include BKE_cdderivedmesh.h
-#include BKE_context.h
-#include BKE_depsgraph.h
-#include BKE_modifier.h
-#include BKE_multires.h
-#include BKE_paint.h
-#include BKE_mesh.h
-#include BKE_key.h
-
-#include WM_api.h
-#include WM_types.h
-
-#include ED_sculpt.h
-#include paint_intern.h
-#include sculpt_intern.h
-
-/** Undo */
-
-static void update_cb(PBVHNode *node, void *unused)
-{
- (void)unused;
- BLI_pbvh_node_mark_update(node);
-}
-
-static void sculpt_undo_restore(bContext *C, ListBase *lb)
-{
- Scene *scene = CTX_data_scene(C);
- Object *ob = CTX_data_active_object(C);
- DerivedMesh *dm = mesh_get_derived_final(scene, ob, 0);
- SculptSession *ss = ob-sculpt;
- SculptUndoNode *unode;
- MVert *mvert;
- MultiresModifierData *mmd;
- int *index;
- int i, j, update= 0;
-
- sculpt_update_mesh_elements(scene, ob, 0);
-
- for(unode=lb-first; unode; unode=unode-next) {
- if(!(strcmp(unode-idname, ob-id.name)==0))
- continue;
-
- if(unode-maxvert) {
- char *shapeName= (char*)unode-shapeName;
-
- /* regular mesh restore */
- if(ss-totvert != unode-maxvert)
- continue;
-
- if (ss-kb strcmp(ss-kb-name, shapeName)) {
- /* shape key has been changed before calling
undo operator */
-
- Key *key= ob_get_key(ob);
- KeyBlock *kb= key_get_named_keyblock(key,
shapeName);
-
- if (kb) {
- ob-shapenr= BLI_findindex(key-block,
kb) + 1;
- ob-shapeflag|= OB_SHAPE_LOCK;
-
- sculpt_update_mesh_elements(scene, ob,
0);
- WM_event_add_notifier(C,
NC_OBJECT|ND_DATA, ob);
- } else {
- /* key has been removed -- skip this
undo node */
- continue;
- }
- }
-
- index= unode-index;
- mvert= ss-mvert;
-
- if (ss-kb) {
- float (*vertCos)[3];
- vertCos= key_to_vertcos(ob, ss-kb);
-
- for(i=0; iunode-totvert; i++)
- swap_v3_v3(vertCos[index[i]],
unode-co[i]);
-
- /* propagate new coords to keyblock */
- sculpt_vertcos_to_key(ob, ss-kb, vertCos);
-
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30333] trunk/blender: Change to text3d: When back or front is enabled, the bevel rim on the other side is not created anymore, just as the back/ fron
Revision: 30333
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30333
Author: campbellbarton
Date: 2010-07-14 19:47:58 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Change to text3d: When back or front is enabled, the bevel rim on the other
side is not created anymore, just as the back/front filling faces are not
created when disabled.
when both are off the behavior is unchanged.
This is needed when rendering alpha text so its possible to have a single layer
of faces but use the bevel option to make text thicker.
adding a rim on the back when back is disabled also doesnt make much sense IMHO.
minor python edits too.
Modified Paths:
--
trunk/blender/doc/blender.1.py
trunk/blender/release/scripts/op/console_python.py
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/python/doc/examples/bpy.data.py
Modified: trunk/blender/doc/blender.1.py
===
--- trunk/blender/doc/blender.1.py 2010-07-14 17:27:56 UTC (rev 30332)
+++ trunk/blender/doc/blender.1.py 2010-07-14 17:47:58 UTC (rev 30333)
@@ -53,7 +53,7 @@
date_string = datetime.date.fromtimestamp(time.time()).strftime(%B %d, %Y)
-filepath = __file__.replace(.py, )
+filepath = os.path.splitext(__file__)[0] + .1
file = open(filepath, w)
Modified: trunk/blender/release/scripts/op/console_python.py
===
--- trunk/blender/release/scripts/op/console_python.py 2010-07-14 17:27:56 UTC
(rev 30332)
+++ trunk/blender/release/scripts/op/console_python.py 2010-07-14 17:47:58 UTC
(rev 30333)
@@ -68,7 +68,7 @@
stderr = io.StringIO()
else:
namespace = {'__builtins__': __builtins__, 'bpy': bpy}
-console = InteractiveConsole(namespace)
+console = InteractiveConsole(locals=namespace,
filename=blender_console)
import io
stdout = io.StringIO()
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2010-07-14
17:27:56 UTC (rev 30332)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2010-07-14
17:47:58 UTC (rev 30333)
@@ -1318,30 +1318,33 @@
short dnr;
/* bevel now in three parts, for proper vertex normals */
- /* part 1 */
- dnr= nr= 2+ cu-bevresol;
- if( (cu-flag (CU_FRONT|CU_BACK))==0)
- nr= 3+ 2*cu-bevresol;
-
- dl= MEM_callocN(sizeof(DispList), makebevelcurve p1);
- dl-verts= MEM_mallocN(nr*3*sizeof(float), makebevelcurve p1);
- BLI_addtail(disp, dl);
- dl-type= DL_SEGM;
- dl-parts= 1;
- dl-flag= DL_BACK_CURVE;
- dl-nr= nr;
+ /* part 1, back */
- /* half a circle */
- fp= dl-verts;
- dangle= (0.5*M_PI/(dnr-1));
- angle= -(nr-1)*dangle;
-
- for(a=0; anr; a++) {
- fp[0]= 0.0;
- fp[1]= (float)(cos(angle)*(cu-ext2));
- fp[2]= (float)(sin(angle)*(cu-ext2)) - cu-ext1;
- angle+= dangle;
- fp+= 3;
+ if((cu-flag CU_BACK) || !(cu-flag CU_FRONT)) {
+ dnr= nr= 2+ cu-bevresol;
+ if( (cu-flag (CU_FRONT|CU_BACK))==0)
+ nr= 3+ 2*cu-bevresol;
+
+ dl= MEM_callocN(sizeof(DispList), makebevelcurve p1);
+ dl-verts= MEM_mallocN(nr*3*sizeof(float),
makebevelcurve p1);
+ BLI_addtail(disp, dl);
+ dl-type= DL_SEGM;
+ dl-parts= 1;
+ dl-flag= DL_BACK_CURVE;
+ dl-nr= nr;
+
+ /* half a circle */
+ fp= dl-verts;
+ dangle= (0.5*M_PI/(dnr-1));
+ angle= -(nr-1)*dangle;
+
+ for(a=0; anr; a++) {
+ fp[0]= 0.0;
+ fp[1]= (float)(cos(angle)*(cu-ext2));
+ fp[2]= (float)(sin(angle)*(cu-ext2)) -
cu-ext1;
+ angle+= dangle;
+ fp+= 3;
+ }
}
/* part 2, sidefaces */
@@ -1374,30 +1377,32 @@
}
}
- /* part 3 */
- dnr= nr= 2+ cu-bevresol;
- if( (cu-flag (CU_FRONT|CU_BACK))==0)
- nr= 3+ 2*cu-bevresol;
-
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30334] trunk/blender/build_files/scons/ tools/Blender.py: Scons/darwin (OSX): blender. app package is now created correctly in the install folder
Revision: 30334
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30334
Author: damien78
Date: 2010-07-14 20:19:34 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Scons/darwin (OSX): blender.app package is now created correctly in the install
folder
Modified Paths:
--
trunk/blender/build_files/scons/tools/Blender.py
Modified: trunk/blender/build_files/scons/tools/Blender.py
===
--- trunk/blender/build_files/scons/tools/Blender.py2010-07-14 17:47:58 UTC
(rev 30333)
+++ trunk/blender/build_files/scons/tools/Blender.py2010-07-14 18:19:34 UTC
(rev 30334)
@@ -498,7 +498,9 @@
builddir, b = os.path.split(a)
libdir = env['LCGDIR'][1:]
osxarch = env['MACOSX_ARCHITECTURE']
+ installdir = env['BF_INSTALLDIR']
print(compiled architecture: %s%(osxarch))
+ print(Installing to %s%(installdir))
if libdir == '../lib/darwin-9.x.universal':
python_zip = 'python_' + osxarch + '.zip' # set specific
python_arch.zip
else:
@@ -513,45 +515,45 @@
sourcedir = bldroot + '/source/darwin/%s.app'%binary
sourceinfo = bldroot +
/source/darwin/%s.app/Contents/Info.plist%binary
- targetinfo = builddir +'/' + %s.app/Contents/Info.plist%binary
- cmd = builddir + '/' +'%s.app'%binary
+ targetinfo = installdir +'/' + %s.app/Contents/Info.plist%binary
+ cmd = installdir + '/' +'%s.app'%binary
if os.path.isdir(cmd):
shutil.rmtree(cmd)
shutil.copytree(sourcedir, cmd)
cmd = cat %s | sed s/VERSION/`cat release/VERSION`/ | sed s/DATE/`date
+'%%Y-%%b-%%d'`/ %s%(sourceinfo,targetinfo)
commands.getoutput(cmd)
- cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir,
binary,builddir, binary, binary)
+ cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir,
binary,installdir, binary, binary)
commands.getoutput(cmd)
- cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(builddir, binary, VERSION)
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(installdir, binary, VERSION)
# print cmd
commands.getoutput(cmd)
- cmd = builddir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
+ cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
shutil.copy(bldroot + '/bin/.blender/.bfont.ttf', cmd)
shutil.copy(bldroot + '/bin/.blender/.Blanguages', cmd)
- cmd = 'cp -R %s/bin/%s/locale
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary)
+ cmd = 'cp -R %s/bin/%s/locale
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
commands.getoutput(cmd)
- cmd = 'cp -R %s/bin/%s/locale
%s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,builddir,binary,VERSION)
+ cmd = 'cp -R %s/bin/%s/locale
%s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp %s/bin/%s/.Blanguages
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary)
+ cmd = 'cp %s/bin/%s/.Blanguages
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
commands.getoutput(cmd)
- cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(builddir,binary,
VERSION)
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary,
VERSION)
commands.getoutput(cmd)
- cmd = 'unzip -q %s/release/%s -d
%s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,builddir,binary,VERSION)
+ cmd = 'unzip -q %s/release/%s -d
%s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/scripts
%s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION)
+ cmd = 'cp -R %s/release/scripts
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/ui
%s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION)
+ cmd = 'cp -R %s/release/ui
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/io
%s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION)
+ cmd = 'cp -R %s/release/io
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(builddir,binary, binary)
+ cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(installdir,binary,
binary)
commands.getoutput(cmd)
- cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {} \;'%(builddir,
binary)
+ cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {}
\;'%(installdir, binary)
commands.getoutput(cmd)
- cmd = 'find %s/%s.app -name .DS_Store -exec rm -rf {} \;'%(builddir,
binary)
+ cmd = 'find %s/%s.app
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30335] trunk/blender: partial fix [#22846 ] GCC 4.4.1 support in Windows
Revision: 30335
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30335
Author: campbellbarton
Date: 2010-07-14 20:22:39 +0200 (Wed, 14 Jul 2010)
Log Message:
---
partial fix [#22846] GCC 4.4.1 support in Windows
Still getting error:
Warning: .drectve `/DEFAULTLIB:LIBCMT /DEFAULTLIB:OLDNAMES ' unrecognized
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2010-07-14 18:19:34 UTC (rev 30334)
+++ trunk/blender/CMakeLists.txt2010-07-14 18:22:39 UTC (rev 30335)
@@ -628,6 +628,12 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
+ IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+ SET(PLATFORM_CFLAGS -msse -msse2 ${PLATFORM_CFLAGS})
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
ENDIF(MSVC)
ENDIF(WIN32)
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-07-14
18:19:34 UTC (rev 30334)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-07-14
18:22:39 UTC (rev 30335)
@@ -49,10 +49,6 @@
ADD_DEFINITIONS(-DINTERNATIONAL)
ENDIF(WITH_INTERNATIONAL)
-IF(WITH_OPENEXR)
- ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
IF(WITH_OPENCOLLADA)
ADD_DEFINITIONS(-DWITH_COLLADA)
ENDIF(WITH_OPENCOLLADA)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30336] branches/soc-2010-leifandersen/ tests/render/run.py: Getting an IOError 24: Too many files open error when the --with-animations flag is used.
Revision: 30336
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30336
Author: leifandersen
Date: 2010-07-14 20:57:01 +0200 (Wed, 14 Jul 2010)
Log Message:
---
Getting an IOError 24: Too many files open error when the --with-animations
flag is used. Which is weird as the only files opened which aren't closed
before another one is opened are the images, done with Image.open(), but those
don't have a close() method.
Modified Paths:
--
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 18:22:39 UTC
(rev 30335)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 18:57:01 UTC
(rev 30336)
@@ -395,7 +395,7 @@
good_path = os.path.join(good_folder, string.replace(filename,
'.blend', ''))
test_path = os.path.join(output_folder, string.replace(filename,
'.blend', ''))
test_case = AnimationTestCase()
-test_case.setup_hash(blend_path, good_path, test_path)
+test_case.setup_image(blend_path, good_path, test_path)
cases.append(test_case)
return cases
@@ -461,6 +461,52 @@
print Or python --build-tests --with-animations to also build
animation tests
print 'Check index.html for more information'
+def anim_output(animation, output_path):
+file = open(output_path, w)
+(output_directory, output_file) = os.path.split(output_path)
+file.write('htmlhead\n')
+file.write('link rel=stylesheet href=style.css type=text/css /\n')
+file.write('titleRender Test Output/title\n/head\n')
+file.write('body\n')
+file.write('div class=noprint id=navcontainera
href=http://www.blender.org/;img width=140 height=50 title=blender.org
home page alt=blender.org home page
src=http://www.blender.org/fileadmin/site/_gfx/nav-home.png;/aa
href=http://www.blender.org/features-gallery/;img width=140 height=50
title=Features amp; Gallery alt=Features amp; Gallery
src=http://www.blender.org/fileadmin/site/_gfx/nav-features.png;/aa
href=http://www.blender.org/download/get-blender/;img width=140
height=50 title=Download alt=Download
src=http://www.blender.org/fileadmin/site/_gfx/nav-download.png;/aa
href=http://www.blender.org/education-help/;img width=140 height=50
title=Tutorials amp; Help alt=Tutorials amp; Help
src=http://www.blender.org/fileadmin/site/_gfx/nav-help.png;/aa
href=http://www.blender.org/community/user-community/;img width=140
height=50 title=Community alt=Community src=http://www.blender.org/f
ileadmin/site/_gfx/nav-community.png/aa
href=http://www.blender.org/development/;img width=140 height=50
title=Development alt=Development
src=http://www.blender.org/fileadmin/site/_gfx/nav-development-on.png;/aa
href=http://www.blender.org/e-shop/;img width=140 height=50
title=e-Shop alt=e-Shop
src=http://www.blender.org/fileadmin/site/_gfx/nav-eshop.png;/a/div \n')
+file.write('div class=document\n')
+file.write('div id=pageheader/div\n')
+file.write('div class=documentwrapper\ndiv class=bodywrapper\ndiv
class=body\n')
+file.write('h1Animation:' + animation.name + '/h1\n')
+file.write('table border=1\n')
+file.write('tr\n')
+file.write('thFilename/th\n')
+file.write('thGood Image/th\n')
+file.write('thLatest Render/th\n')
+file.write('thDiff/th\n')
+file.write('thMatch?/th\n')
+file.write('/tr\n')
+
+i = 1
+for frame in animation.diff_animation:
+file.write('tr\n')
+file.write('td Frame: ' + str(i) + '/td\n')
+file.write('tda href=' + animation.good_path_arr[i-1] + 'img
src=' + animation.good_path_arr[i-1] + ' alt=Good Image width=200
height=150/a/td\n')
+file.write('tda href=' + animation.test_path_arr[i-1] + 'img
src=' + animation.test_path_arr[i-1] + ' alt=Latest Render width=200
height=150/a/td\n')
+file.write('tda href=' + animation.diff_path_arr[i-1] + 'img
src=' + animation.diff_path_arr[i-1] + ' alt=Image Diff width=200
height=150/a/td\n')
+file.write('td')
+if animation.passed_arr[i-1]:
+file.write('font color=ooffooOK/font: ' +
str(animation.bad_pixels_arr[i-1]) + ' of ' +
str(animation.pixel_count_arr[i-1]) + ' pixels different, ' +
str(animation.difference) + '% different.')
+else:
+file.write('font color=ffFAIL/font: ' +
str(animation.bad_pixels_arr[i-1]) + ' of ' +
str(animation.pixel_count_arr[i-1]) + ' pixels different, ' +
str(animation.difference) + '% different.')
+if animation.message != None:
+file.write( + animation.message)
+file.write('/td\n/tr\n')
+i+=1
+
+file.write('/table\n')
+file.write('/div\n/div\n/div\n')
+file.write('div class=clearer/div\n')
+file.write('div
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30337] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 30335.
Revision: 30337 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30337 Author: kjym3 Date: 2010-07-14 21:01:40 +0200 (Wed, 14 Jul 2010) Log Message: --- Merged changes in the trunk up to revision 30335. Revision Links: -- http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30335 Modified Paths: -- branches/soc-2008-mxcurioni/CMakeLists.txt branches/soc-2008-mxcurioni/Makefile branches/soc-2008-mxcurioni/SConstruct branches/soc-2008-mxcurioni/doc/blender.1.py branches/soc-2008-mxcurioni/extern/libopenjpeg/dwt.c branches/soc-2008-mxcurioni/intern/ghost/SConscript branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.vcproj branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj branches/soc-2008-mxcurioni/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_calltip.py branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py branches/soc-2008-mxcurioni/release/scripts/op/console_python.py branches/soc-2008-mxcurioni/release/scripts/op/object.py branches/soc-2008-mxcurioni/release/scripts/op/presets.py branches/soc-2008-mxcurioni/release/scripts/op/uv.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sca.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30339] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: * removed unneeded autosmooth_overlap, forgot to remove before merge
Revision: 30339
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30339
Author: jwilkins
Date: 2010-07-14 22:04:02 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* removed unneeded autosmooth_overlap, forgot to remove before merge
* replaced omp critical sections, code either crashes or does not function
correctly without them
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14
19:59:32 UTC (rev 30338)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-14
20:04:02 UTC (rev 30339)
@@ -229,8 +229,6 @@
int alt_smooth;
float plane_trim_squared;
-
- float autosmooth_overlap;
} StrokeCache;
/* = OPENGL =
@@ -580,7 +578,7 @@
/* Return modified brush strength. Includes the direction of the brush,
positive
values pull vertices, negative values push. Uses tablet pressure and a
special multiplier found experimentally to scale the strength factor. */
-static float brush_strength(Sculpt *sd, StrokeCache *cache, float feather,
float overlap)
+static float brush_strength(Sculpt *sd, StrokeCache *cache, float feather)
{
Brush *brush = paint_brush(sd-paint);
@@ -590,6 +588,8 @@
float pressure = brush-flag BRUSH_ALPHA_PRESSURE ?
cache-pressure : 1;
float pen_flip = cache-pen_flip ? -1 : 1;
float invert = cache-invert ? -1 : 1;
+ float accum= integrate_overlap(brush);
+ float overlap = (brush-flag BRUSH_SPACE_ATTEN brush-flag
BRUSH_SPACE !(brush-flag BRUSH_ANCHORED)) (brush-spacing 100) ?
1.0f/accum : 1; // spacing is integer percentage of radius, divide by 50 to get
normalized diameter
float flip = dir * invert * pen_flip;
switch(brush-sculpt_tool){
@@ -912,7 +912,7 @@
BLI_pbvh_vertex_iter_end;
}
- //#pragma omp critical
+ #pragma omp critical
{
add_v3_v3(an, private_an);
add_v3_v3(out_flip, private_out_flip);
@@ -1065,7 +1065,7 @@
BLI_pbvh_node_get_grids(ss-pbvh, node, grid_indices, totgrid,
NULL, gridsize, griddata, gridadj);
- //#pragma omp critical
+ #pragma omp critical
{
tmpgrid= MEM_mallocN(sizeof(float)*3*gridsize*gridsize,
tmpgrid);
tmprow= MEM_mallocN(sizeof(float)*3*gridsize, tmprow);
@@ -1150,7 +1150,7 @@
}
}
- //#pragma omp critical
+ #pragma omp critical
{
MEM_freeN(tmpgrid);
MEM_freeN(tmprow);
@@ -2403,10 +2403,10 @@
if (brush-sculpt_tool != SCULPT_TOOL_SMOOTH
brush-autosmooth_factor 0) {
if (brush-flag BRUSH_INVERSE_SMOOTH_PRESSURE) {
- smooth(sd, ss, nodes, totnode,
brush-autosmooth_factor*(1-ss-cache-pressure)*ss-cache-autosmooth_overlap);
+ smooth(sd, ss, nodes, totnode,
brush-autosmooth_factor*(1-ss-cache-pressure));
}
else {
- smooth(sd, ss, nodes, totnode,
brush-autosmooth_factor*ss-cache-autosmooth_overlap);
+ smooth(sd, ss, nodes, totnode,
brush-autosmooth_factor);
}
}
@@ -2580,13 +2580,9 @@
int i;
float feather = calc_symmetry_feather(sd, ss-cache);
- float accum = integrate_overlap(brush);
- float overlap = (brush-flag BRUSH_SPACE_ATTEN brush-flag
BRUSH_SPACE !(brush-flag BRUSH_ANCHORED)) (brush-spacing 100) ?
1.0f/accum : 1; // spacing is integer percentage of radius, divide by 50 to get
normalized diameter
- ss-cache-autosmooth_overlap = overlap;
+ cache-bstrength= brush_strength(sd, cache, feather);
- cache-bstrength= brush_strength(sd, cache, feather, overlap);
-
cache-symmetry= symm;
/* symm is a bit combination of XYZ - 1 is mirror X; 2 is Y; 3 is XY; 4
is Z; 5 is XZ; 6 is YZ; 7 is XYZ */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30340] trunk/blender/source/blender/ blenkernel/BKE_blender.h: * Accidentally bumped file subversion after sculpt merge.
Revision: 30340 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30340 Author: jwilkins Date: 2010-07-14 22:08:30 +0200 (Wed, 14 Jul 2010) Log Message: --- * Accidentally bumped file subversion after sculpt merge. Perhaps this should be done, but not without permission. My comment even said not to merge it :) Modified Paths: -- trunk/blender/source/blender/blenkernel/BKE_blender.h Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h === --- trunk/blender/source/blender/blenkernel/BKE_blender.h 2010-07-14 20:04:02 UTC (rev 30339) +++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2010-07-14 20:08:30 UTC (rev 30340) @@ -45,7 +45,7 @@ struct Main; #define BLENDER_VERSION252 -#define BLENDER_SUBVERSION 6 // XXX: this shouldn't be merged with trunk, this is so Sculpt branch can detect old files +#define BLENDER_SUBVERSION 5 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30341] branches/soc-2010-nicks/source: - set default value for level height params
Revision: 30341
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30341
Author: nicks
Date: 2010-07-14 22:09:04 +0200 (Wed, 14 Jul 2010)
Log Message:
---
- set default value for level height params
- added flag OPTYPE_UNDO for navmesh operator to enable undo operation
Modified Paths:
--
branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp
Modified: branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
===
--- branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
2010-07-14 20:09:04 UTC (rev 30341)
@@ -10958,13 +10958,15 @@
tex-saturation= 1.0f;
}
- //set defaults for recast data
+ //set defaults for obstacle avoidance, recast data
{
Scene *sce;
for(sce = main-scene.first; sce; sce = sce-id.next)
{
- if(sce-unit.scale_length == 0.0f)
- sce-unit.scale_length= 1.0f;
+
+ if (sce-gm.levelHeight == 0.f)
+ sce-gm.levelHeight = 2.f;
+
if(sce-gm.recastData.cellsize == 0.0f)
sce-gm.recastData.cellsize = 0.3f;
if(sce-gm.recastData.cellheight == 0.0f)
Modified:
branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
===
--- branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/editors/object/object_navmesh.cpp
2010-07-14 20:09:04 UTC (rev 30341)
@@ -426,5 +426,8 @@
/* api callbacks */
ot-exec= create_navmesh_exec;
+
+ /* flags */
+ ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
}
Modified:
branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
===
--- branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_navmesh.cpp
2010-07-14 20:09:04 UTC (rev 30341)
@@ -426,8 +426,9 @@
NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
+
//for test
- result = testCreateNavMesh(nmmd, derivedData);
+ //result = testCreateNavMesh(nmmd, derivedData);
//result = buildNavMesh(nmmd, derivedData);
return result;
Modified: branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===
--- branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp
2010-07-14 20:08:30 UTC (rev 30340)
+++ branches/soc-2010-nicks/source/gameengine/Ketsji/KX_NavMeshObject.cpp
2010-07-14 20:09:04 UTC (rev 30341)
@@ -646,7 +646,7 @@
for (int i = 0, j = (int)poly-nv-1; i (int)poly-nv;
j = i++)
{
- if (poly-n[j] renderMode==DETAILED_TRIS)
+ if (poly-n[j] renderMode==WALLS)
continue;
const float* vif =
m_navMesh-getVertex(poly-v[i]);
const float* vjf =
m_navMesh-getVertex(poly-v[j]);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30342] trunk/blender/source/blender/ blenloader/intern/readfile.c: * new settings for brushes in do_versions had wrong subversionfile
Revision: 30342
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30342
Author: jwilkins
Date: 2010-07-14 22:16:04 +0200 (Wed, 14 Jul 2010)
Log Message:
---
* new settings for brushes in do_versions had wrong subversionfile
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-14
20:09:04 UTC (rev 30341)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-14
20:16:04 UTC (rev 30342)
@@ -11020,7 +11020,7 @@
brush-rate = 0.1f;
/* New Settings */
- if (main-versionfile 252 || (main-versionfile ==
252 main-subversionfile 6)) {
+ if (main-versionfile 252 || (main-versionfile ==
252 main-subversionfile 5)) {
brush-flag |= BRUSH_SPACE_ATTEN; // explicitly
enable adaptive space
// spacing was originally in pixels, convert it
to percentage for new version
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30344] trunk/blender/source/blender/ editors/sculpt_paint/paint_stroke.c: mistake in recent commit, set all axis values.
Revision: 30344
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30344
Author: campbellbarton
Date: 2010-07-14 22:19:53 +0200 (Wed, 14 Jul 2010)
Log Message:
---
mistake in recent commit, set all axis values.
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
2010-07-14 20:18:19 UTC (rev 30343)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
2010-07-14 20:19:53 UTC (rev 30344)
@@ -243,8 +243,8 @@
}
else {
snap-brush_map_mode = -1;
- snap-ofs[0]= snap-ofs[0]= snap-ofs[0]= -1;
- snap-size[0]= snap-size[0]= snap-size[0]= -1;
+ snap-ofs[0]= snap-ofs[1]= snap-ofs[2]= -1;
+ snap-size[0]= snap-size[1]= snap-size[2]= -1;
snap-rot = -1;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30345] trunk/blender: CMake patch from Ralf H?\195?\182lzemer (cheleb)
Revision: 30345
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30345
Author: campbellbarton
Date: 2010-07-14 22:26:46 +0200 (Wed, 14 Jul 2010)
Log Message:
---
CMake patch from Ralf H?\195?\182lzemer (cheleb)
[#22849] Fix cmake install target on linux
--- from the tracker ---
This patch fixes the install target for the linux platform. Since the new
configuration path changes are in effect, files have to be installed in the
correct places instead of just copying the local installation to
$PREFIX/share/blender.
It also provides a new macro to determine the correct blender version values.
Changes in this patch include:
- the .desktop menu file is installed in $PREFIX/share/applications and points
to the svg icon instead of a png one, which is also installed in
$PREFIX/share/pixmaps
- docs are installed in $PREFIX/share/doc/blender
- scripts are installed in in $PREFIX/share/blender/x.xx/
- locales are installed in in $PREFIX/share/blender/x.xx/datafiles
- a new cmake macro determines and sets the correct values for
BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION,
BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR,
BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing
source/blender/blenkernel/BKE_blender.h and calculating major/minor values.
This replaces the hardcoded value in the top CMakeLists file and is used by all
platforms.
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/release/freedesktop/blender.desktop
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2010-07-14 20:19:53 UTC (rev 30344)
+++ trunk/blender/CMakeLists.txt2010-07-14 20:26:46 UTC (rev 30345)
@@ -55,10 +55,6 @@
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION 2.5)
-
#-
# Load some macros.
INCLUDE(build_files/cmake/macros.cmake)
@@ -66,6 +62,8 @@
#-
# Set default config options
+GET_BLENDER_VERSION()
+
# Blender internal features
OPTION(WITH_INTERNATIONAL Enable I18N (International fonts and text) ON)
OPTION(WITH_LCMS Enable color correction with lcms OFF)
Modified: trunk/blender/build_files/cmake/macros.cmake
===
--- trunk/blender/build_files/cmake/macros.cmake2010-07-14 20:19:53 UTC
(rev 30344)
+++ trunk/blender/build_files/cmake/macros.cmake2010-07-14 20:26:46 UTC
(rev 30345)
@@ -198,3 +198,36 @@
SUPPORT_SSE_BUILD)
ENDMACRO(TEST_SSE_SUPPORT)
+MACRO(GET_BLENDER_VERSION)
+ FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h
CONTENT)
+ STRING(REGEX REPLACE \n ; CONTENT ${CONTENT})
+ STRING(REGEX REPLACE \t ; CONTENT ${CONTENT})
+ STRING(REGEX REPLACE ; CONTENT ${CONTENT})
+
+ FOREACH(ITEM ${CONTENT})
+ IF(LASTITEM MATCHES BLENDER_VERSION)
+ MATH(EXPR BLENDER_VERSION_MAJOR ${ITEM} / 100)
+ MATH(EXPR BLENDER_VERSION_MINOR ${ITEM} % 100)
+ SET(BLENDER_VERSION
${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR})
+ ENDIF(LASTITEM MATCHES BLENDER_VERSION)
+
+ IF(LASTITEM MATCHES BLENDER_SUBVERSION)
+ SET(BLENDER_SUBVERSION ${ITEM})
+ ENDIF(LASTITEM MATCHES BLENDER_SUBVERSION)
+
+ IF(LASTITEM MATCHES BLENDER_MINVERSION)
+ MATH(EXPR BLENDER_MINVERSION_MAJOR ${ITEM} / 100)
+ MATH(EXPR BLENDER_MINVERSION_MINOR ${ITEM} % 100)
+ SET(BLENDER_MINVERSION
${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR})
+ ENDIF(LASTITEM MATCHES BLENDER_MINVERSION)
+
+ IF(LASTITEM MATCHES BLENDER_MINSUBVERSION)
+ SET(BLENDER_MINSUBVERSION ${ITEM})
+ ENDIF(LASTITEM MATCHES BLENDER_MINSUBVERSION)
+
+ SET(LASTITEM ${ITEM})
+ ENDFOREACH(ITEM ${CONTENT})
+
+ MESSAGE(STATUS Version major: ${BLENDER_VERSION_MAJOR}, Version minor:
${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version:
${BLENDER_VERSION})
+ MESSAGE(STATUS Minversion major: ${BLENDER_MINVERSION_MAJOR},
Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion:
${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION})
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30346] trunk/blender/source/blender: - change blend thumbnail loading function not to use goto's
Revision: 30346
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30346
Author: campbellbarton
Date: 2010-07-14 22:31:11 +0200 (Wed, 14 Jul 2010)
Log Message:
---
- change blend thumbnail loading function not to use goto's
- fix for some warnings
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2010-07-14 20:26:46 UTC (rev 30345)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2010-07-14 20:31:11 UTC (rev 30346)
@@ -197,7 +197,7 @@
if (RNA_function_call(C, reports,
ptr, func, parms) == 0) {
int* ret;
-
RNA_parameter_get_lookup(parms, ret, ret);
+
RNA_parameter_get_lookup(parms, ret, (void **)ret);
if (!(*ret)) {
RNA_parameter_list_free(parms);
Modified: trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
===
--- trunk/blender/source/blender/imbuf/intern/thumbs_blend.c2010-07-14
20:26:46 UTC (rev 30345)
+++ trunk/blender/source/blender/imbuf/intern/thumbs_blend.c2010-07-14
20:31:11 UTC (rev 30346)
@@ -37,54 +37,60 @@
/* extracts the thumbnail from between the 'REND' and the 'GLOB'
* chunks of the header, dont use typical blend loader because its too slow */
-ImBuf *IMB_loadblend_thumb(const char *path)
+
+static ImBuf *loadblend_thumb(gzFile gzfile)
{
char buf[8];
int code= 0;
char endian, pointer_size;
char endian_switch;
int len, im_len, x, y;
- int *rect= NULL;
+ ImBuf *img= NULL;
- gzFile gzfile;
-
- ImBuf *img;
-
- /* not necessarily a gzip */
- gzfile = gzopen(path, rb);
- if (NULL == gzfile ) {
+ /* read the blend file header */
+ if(gzread(gzfile, buf, 8) != 8)
return NULL;
- }
-
- /* read the blend file header */
- if(gzread(gzfile, buf, 8) != 8) goto thumb_error;
- if(strncmp(buf, BLENDER, 7)) goto thumb_error;
-
- if(buf[7]=='-') pointer_size= 8;
- else if(buf[7]=='_')pointer_size= 4;
- elsegoto
thumb_error;
-
+ if(strncmp(buf, BLENDER, 7))
+ return NULL;
+
+ if(buf[7]=='-')
+ pointer_size= 8;
+ else if(buf[7]=='_')
+ pointer_size= 4;
+ else
+ return NULL;
+
/* read the next 4 bytes, only need the first char, ignore the version
*/
/* endian and vertsion (ignored) */
- if(gzread(gzfile, buf, 4) != 4) goto thumb_error;
-
- if(buf[0]=='V') endian=
B_ENDIAN; /* big: PPC */
- else if(buf[0]=='v')endian= L_ENDIAN; /*
little: x86 */
- elsegoto
thumb_error;
+ if(gzread(gzfile, buf, 4) != 4)
+ return NULL;
+ if(buf[0]=='V')
+ endian= B_ENDIAN; /* big: PPC */
+ else if(buf[0]=='v')
+ endian= L_ENDIAN; /* little: x86 */
+ else
+ return NULL;
+
while(gzread(gzfile, code, sizeof(int)) == sizeof(int)) {
endian_switch = ((ENDIAN_ORDER != endian)) ? 1 : 0;
-
- if(gzread(gzfile, buf, sizeof(int)) != sizeof(int))
goto thumb_error;
+
+ if(gzread(gzfile, buf, sizeof(int)) != sizeof(int))
+ return NULL;
+
len = *( (int *)((void *)buf) );
- if(endian_switch) SWITCH_INT(len);
-
+
+ if(endian_switch)
+ SWITCH_INT(len);
+
/* finally read the rest of the bhead struct, pointer and 2
ints */
- if(gzread(gzfile, buf, pointer_size) != pointer_size) goto
thumb_error;
- if(gzread(gzfile, buf, sizeof(int) * 2) != sizeof(int) * 2)
goto thumb_error;
+ if(gzread(gzfile, buf, pointer_size) != pointer_size)
+ return NULL;
+ if(gzread(gzfile, buf, sizeof(int) * 2) != sizeof(int) * 2)
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30347] trunk/blender/source: patch from Goran Milovanovic for the BGE python api.
Revision: 30347
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30347
Author: campbellbarton
Date: 2010-07-14 22:52:04 +0200 (Wed, 14 Jul 2010)
Log Message:
---
patch from Goran Milovanovic for the BGE python api.
camera.ortho_scale (use when in ortho mode only)
(own previous commit incorrectly removed thumb metadata from new imbuf)
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.h
trunk/blender/source/gameengine/PyDoc/bge.types.rst
Modified: trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
===
--- trunk/blender/source/blender/imbuf/intern/thumbs_blend.c2010-07-14
20:31:11 UTC (rev 30346)
+++ trunk/blender/source/blender/imbuf/intern/thumbs_blend.c2010-07-14
20:52:04 UTC (rev 30347)
@@ -121,7 +121,7 @@
return NULL;
/* finally malloc and read the data */
- img= IMB_allocImBuf(x, y, 32, IB_rect, 0);
+ img= IMB_allocImBuf(x, y, 32, IB_rect | IB_metadata, 0);
if(gzread(gzfile, img-rect, len) != len) {
IMB_freeImBuf(img);
Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp2010-07-14
20:31:11 UTC (rev 30346)
+++ trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp2010-07-14
20:52:04 UTC (rev 30347)
@@ -499,6 +499,7 @@
KX_PYATTRIBUTE_RW_FUNCTION(perspective, KX_Camera,
pyattr_get_perspective, pyattr_set_perspective),
KX_PYATTRIBUTE_RW_FUNCTION(lens, KX_Camera,
pyattr_get_lens, pyattr_set_lens),
+ KX_PYATTRIBUTE_RW_FUNCTION(ortho_scale, KX_Camera,
pyattr_get_ortho_scale, pyattr_set_ortho_scale),
KX_PYATTRIBUTE_RW_FUNCTION(near, KX_Camera,
pyattr_get_near, pyattr_set_near),
KX_PYATTRIBUTE_RW_FUNCTION(far, KX_Camera, pyattr_get_far,
pyattr_set_far),
@@ -728,6 +729,26 @@
return PY_SET_ATTR_SUCCESS;
}
+PyObject* KX_Camera::pyattr_get_ortho_scale(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef)
+{
+ KX_Camera* self= static_castKX_Camera*(self_v);
+ return PyFloat_FromDouble(self-m_camdata.m_scale);
+}
+
+int KX_Camera::pyattr_set_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF
*attrdef, PyObject *value)
+{
+ KX_Camera* self= static_castKX_Camera*(self_v);
+ float param = PyFloat_AsDouble(value);
+ if (param == -1) {
+ PyErr_SetString(PyExc_AttributeError, camera.scale = float:
KX_Camera, expected a float greater then zero);
+ return PY_SET_ATTR_FAIL;
+ }
+
+ self-m_camdata.m_scale= param;
+ self-m_set_projection_matrix = false;
+ return PY_SET_ATTR_SUCCESS;
+}
+
PyObject* KX_Camera::pyattr_get_near(void *self_v, const KX_PYATTRIBUTE_DEF
*attrdef)
{
KX_Camera* self= static_castKX_Camera*(self_v);
Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.h
===
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.h 2010-07-14 20:31:11 UTC
(rev 30346)
+++ trunk/blender/source/gameengine/Ketsji/KX_Camera.h 2010-07-14 20:52:04 UTC
(rev 30347)
@@ -289,6 +289,8 @@
static PyObject*pyattr_get_lens(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_lens(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+ static PyObject*pyattr_get_ortho_scale(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_ortho_scale(void *self_v,
const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject*pyattr_get_near(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
static int pyattr_set_near(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
static PyObject*pyattr_get_far(void *self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
Modified: trunk/blender/source/gameengine/PyDoc/bge.types.rst
===
--- trunk/blender/source/gameengine/PyDoc/bge.types.rst 2010-07-14 20:31:11 UTC
(rev 30346)
+++ trunk/blender/source/gameengine/PyDoc/bge.types.rst 2010-07-14 20:52:04 UTC
(rev 30347)
@@ -4185,6 +4185,12 @@
:type: float
+ .. attribute:: ortho_scale
+
+ The camera's view scale when in orthographic mode.
+
+ :type: float
+
.. attribute:: near
The camera's near clip distance.
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30348] trunk/blender/source/blender/ blenloader/intern/writefile.c: To be actually useful, also report the filename when write operation fails.
Revision: 30348
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30348
Author: jesterking
Date: 2010-07-14 22:52:23 +0200 (Wed, 14 Jul 2010)
Log Message:
---
To be actually useful, also report the filename when write operation fails.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/writefile.c
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2010-07-14
20:52:04 UTC (rev 30347)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2010-07-14
20:52:23 UTC (rev 30348)
@@ -2481,7 +2481,7 @@
file = open(tempname,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
if(file == -1) {
- BKE_reportf(reports, RPT_ERROR, Can't open file for writing:
%s., strerror(errno));
+ BKE_reportf(reports, RPT_ERROR, Can't open file %s for
writing: %s., tempname, strerror(errno));
return 0;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30349] branches/soc-2010-leifandersen/ tests/render/run.py: 1.
Revision: 30349 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30349 Author: leifandersen Date: 2010-07-14 23:01:21 +0200 (Wed, 14 Jul 2010) Log Message: --- 1. Added a --good-blender-bin flag to set the good blender bin. 2. Fixed the problem of --with-animations causing the whole app to crash, but --with-animations still has a few new problems. Modified Paths: -- branches/soc-2010-leifandersen/tests/render/run.py Modified: branches/soc-2010-leifandersen/tests/render/run.py === --- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 20:52:23 UTC (rev 30348) +++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-14 21:01:21 UTC (rev 30349) @@ -12,7 +12,6 @@ from optparse import OptionParser BLENDER_BIN = 'blender' -GOOD_BLENDER_BIN = 'blender' VERBOSE = False class ImageTestCase: @@ -31,9 +30,6 @@ bad_pixels = None pixel_count = None diff_sum = None -good_image = None -test_image = None -diff_image = None pixel_range = None difference = None good_hash = None @@ -65,12 +61,6 @@ self.good_path = good_path self.test_path = test_path self.mode = 'Image' -try: -self.good_image = Image.open(good_path) -except IOError: -self.passed = False -self.good_image = None -self.messaged = 'Failed to find good image' def generate_hash(self, image): hash = 0 @@ -80,6 +70,16 @@ hash+= p[0] + p[1] + p[2] return hash +def get_images(self): +try: +good_image = Image.open(self.good_path) +test_image = Image.open(self.test_path) +diff_image = ImageChops.difference(good_image, test_image) +except IOError: +good_image = test_image = diff_image = None +finally: +return (good_image, test_image, diff_image) + def format_frame(self, num): frame_num = str(num) while len(frame_num) 4: @@ -98,31 +98,18 @@ p.wait() self.test_path += '_0001.png' -try: -self.test_image = Image.open(self.test_path) -self.test_hash = self.generate_hash(self.test_image) -except IOError: -self.test_image = None -self.passed = False -self.pixel_range = 0 -self.bad_pixels = 0 -self.pixel_count = 0 -self.diff_sum = 0 -self.difference = 0 -self.message = Failed to render def image_test(self): '''Runs the test, filling in all of the usefull fields''' -if self.good_image != None and self.test_image != None: +try: +(good_image, test_image, diff_image) = self.get_images() self.diff_sum = 0 -self.diff_image = ImageChops.difference(self.good_image, self.test_image) -self.generate_hash(self.diff_image) self.bad_pixels = 0 -self.pixel_range = len(self.diff_image.histogram()) -self.pixel_count = self.diff_image.size[0] * self.diff_image.size[1] -for i in range(0,self.diff_image.size[0]): -for j in range(0, self.diff_image.size[1]): -p = self.diff_image.getpixel((i,j)) +self.pixel_range = len(diff_image.histogram()) +self.pixel_count = diff_image.size[0] * diff_image.size[1] +for i in range(0,diff_image.size[0]): +for j in range(0, diff_image.size[1]): +p = diff_image.getpixel((i,j)) self.diff_sum+= p[0] + p[1] + p[2] if p[0] + p[1] + p[2] 10: self.bad_pixels+=1 @@ -131,26 +118,41 @@ self.passed = True else: self.passed = False +except TypeError: +self.passed = False +self.diff_sum = -1 +self.bad_pixels = -1 +self.pixel_count = -1 +self.pixel_range = -1 +self.message = 'An error Occurred' +except AttributeError: +self.passed = False +self.diff_sum = -1 +self.bad_pixels = -1 +self.pixel_count = -1 +self.pixel_range = -1 +self.message = 'An error Occurred' +finally: return self.passed def hash_test(self): -if self.test_image == None: +if test_image == None: try: -self.test_image = Image.open(self.test_path) +test_image = Image.open(self.test_path) except IOError: self.passed = False -if self.test_image != None: +if test_image != None: if self.good_hash == None: -if self.good_image != None: -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30350] branches/bmesh/blender: wip commit ; DO NOT USE.
Revision: 30350 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30350 Author: joeedh Date: 2010-07-15 00:06:10 +0200 (Thu, 15 Jul 2010) Log Message: --- wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later). Modified Paths: -- branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c branches/bmesh/blender/source/blender/CMakeLists.txt branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c branches/bmesh/blender/source/blender/blenkernel/intern/BME_mesh.c branches/bmesh/blender/source/blender/blenkernel/intern/BME_structure.c branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c branches/bmesh/blender/source/blender/blenlib/BLI_array.h branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c branches/bmesh/blender/source/blender/blenlib/intern/DLRB_tree.c branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c branches/bmesh/blender/source/blender/blenloader/CMakeLists.txt branches/bmesh/blender/source/blender/bmesh/bmesh.h branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.h branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c branches/bmesh/blender/source/blender/bmesh/operators/connectops.c branches/bmesh/blender/source/blender/bmesh/operators/createops.c branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c branches/bmesh/blender/source/blender/bmesh/operators/utils.c branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c branches/bmesh/blender/source/blender/bmesh/tools/BME_duplicate.c branches/bmesh/blender/source/blender/bmesh/tools/BME_extrude.c branches/bmesh/blender/source/blender/editors/CMakeLists.txt
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30351] trunk/blender/source/blender/ blenlib/BLI_winstuff.h: S_ISDIR and S_ISREG were checking completely wrong for directory and regular file bits .
Revision: 30351 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30351 Author: jesterking Date: 2010-07-15 00:16:56 +0200 (Thu, 15 Jul 2010) Log Message: --- S_ISDIR and S_ISREG were checking completely wrong for directory and regular file bits. Modified Paths: -- trunk/blender/source/blender/blenlib/BLI_winstuff.h Modified: trunk/blender/source/blender/blenlib/BLI_winstuff.h === --- trunk/blender/source/blender/blenlib/BLI_winstuff.h 2010-07-14 22:06:10 UTC (rev 30350) +++ trunk/blender/source/blender/blenlib/BLI_winstuff.h 2010-07-14 22:16:56 UTC (rev 30351) @@ -74,10 +74,10 @@ #define MAXPATHLEN MAX_PATH #ifndef S_ISREG -#define S_ISREG(x) ((xS_IFMT) == S_IFREG) +#define S_ISREG(x) (((x)_S_IFREG) == _S_IFREG) #endif #ifndef S_ISDIR -#define S_ISDIR(x) ((xS_IFMT) == S_IFDIR) +#define S_ISDIR(x) (((x)_S_IFDIR) == _S_IFDIR) #endif /* defines for using ISO C++ conformant names */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30353] trunk/blender/source/blender/ blenlib/intern: * Use same BLI_exist() on all platforms.
Revision: 30353
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30353
Author: jesterking
Date: 2010-07-15 01:39:23 +0200 (Thu, 15 Jul 2010)
Log Message:
---
* Use same BLI_exist() on all platforms.
* remove extra sys/types.h include.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/storage.c
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2010-07-14
23:28:44 UTC (rev 30352)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2010-07-14
23:39:23 UTC (rev 30353)
@@ -205,6 +205,10 @@
return 0;
}
+int BLI_exists(char *file) {
+ return BLI_exist(file);
+}
+
#ifdef WIN32
static char str[MAXPATHLEN+12];
@@ -282,10 +286,6 @@
return 1;
}
-int BLI_exists(char *file) {
- return (GetFileAttributes(file) != 0x);
-}
-
void BLI_recurdir_fileops(char *dirname) {
char *lslash;
char tmp[MAXPATHLEN];
@@ -326,10 +326,10 @@
return rename(from, to);
}
-#else /* The sane UNIX world */
+#else /* The weirdo UNIX world */
/*
- * but the sane UNIX world is tied to the interface, and the system
+ * but the UNIX world is tied to the interface, and the system
* timer, and... We implement a callback mechanism. The system will
* have to initialise the callback before the functions will work!
* */
@@ -374,10 +374,6 @@
return system(str);
}
-int BLI_exists(char *file) {
- return BLI_exist(file);
-}
-
void BLI_recurdir_fileops(char *dirname) {
char *lslash;
char tmp[MAXPATHLEN];
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===
--- trunk/blender/source/blender/blenlib/intern/storage.c 2010-07-14
23:28:44 UTC (rev 30352)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2010-07-14
23:39:23 UTC (rev 30353)
@@ -76,7 +76,6 @@
#endif
#ifdef WIN32
-#include sys/types.h
#include io.h
#include direct.h
#include BLI_winstuff.h
@@ -433,18 +432,20 @@
int BLI_exist(char *name)
{
- struct stat st;
#ifdef WIN32
+ struct _stat64i32 st;
/* in Windows stat doesn't recognize dir ending on a slash
To not break code where the ending slash is expected we
don't mess with the argument name directly here - elubie */
char tmp[FILE_MAXDIR+FILE_MAXFILE];
- int len;
+ int len, res;
BLI_strncpy(tmp, name, FILE_MAXDIR+FILE_MAXFILE);
len = strlen(tmp);
if (len 3 ( tmp[len-1]=='\\' || tmp[len-1]=='/') ) tmp[len-1] =
'\0';
- if (stat(tmp,st)) return(0);
+ res = _stat(tmp, st);
+ if (res == -1) return(0);
#else
+ struct stat st;
if (stat(name,st)) return(0);
#endif
return(st.st_mode);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30354] trunk/blender/source/blender: Logic UI: Changing Controllers names to follow Sensors and actuators ( back to have only the first latter capita
Revision: 30354
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30354
Author: jesterking
Date: 2010-07-15 01:51:21 +0200 (Thu, 15 Jul 2010)
Log Message:
---
Logic UI: Changing Controllers names to follow Sensors and actuators (back to
have only the first latter capitalized) + change the controller state only when
in expanded mode (show the number otherwise).
Cosmetic commit, no structural/big code changes (patch by dfelinto).
Modified Paths:
--
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===
--- trunk/blender/source/blender/editors/space_logic/logic_window.c
2010-07-14 23:39:23 UTC (rev 30353)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c
2010-07-14 23:51:21 UTC (rev 30354)
@@ -644,17 +644,17 @@
{
switch (type) {
case CONT_LOGIC_AND:
- return AND;
+ return And;
case CONT_LOGIC_OR:
- return OR;
+ return Or;
case CONT_LOGIC_NAND:
- return NAND;
+ return Nand;
case CONT_LOGIC_NOR:
- return NOR;
+ return Nor;
case CONT_LOGIC_XOR:
- return XOR;
+ return Xor;
case CONT_LOGIC_XNOR:
- return XNOR;
+ return Xnor;
case CONT_EXPRESSION:
return Expression;
case CONT_PYTHON:
@@ -3537,7 +3537,8 @@
uiLayout *box, *row, *subrow;
bController *cont= (bController *)ptr-data;
- char name[3]; //XXX provisorly for state number
+ char state[3];
+ sprintf(state, %d, RNA_int_get(ptr, state));
box= uiLayoutBox(layout);
row= uiLayoutRow(box, 0);
@@ -3546,15 +3547,14 @@
if(RNA_boolean_get(ptr, expanded)) {
uiItemR(row, ptr, type, 0, , 0);
uiItemR(row, ptr, name, 0, , 0);
+ /* XXX provisory for Blender 2.50Beta */
+ uiDefBlockBut(uiLayoutGetBlock(layout),
controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22,
UI_UNIT_Y, Set controller state index (from 1 to 30));
} else {
uiItemL(row, controller_name(cont-type), 0);
uiItemL(row, cont-name, 0);
+ uiItemL(row, state, 0);
}
- /* XXX provisory for Blender 2.50Beta */
- sprintf(name, %d, RNA_int_get(ptr, state));
- uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu,
cont, name, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, Set controller state
index (from 1 to 30));
-
uiItemR(row, ptr, priority, 0, , 0);
if(RNA_boolean_get(ptr, expanded)==0) {
Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c
2010-07-14 23:39:23 UTC (rev 30353)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c
2010-07-14 23:51:21 UTC (rev 30354)
@@ -32,12 +32,12 @@
#include DNA_controller_types.h
EnumPropertyItem controller_type_items[] ={
- {CONT_LOGIC_AND, LOGIC_AND, 0, AND, Logic And},
- {CONT_LOGIC_OR, LOGIC_OR, 0, OR, Logic Or},
- {CONT_LOGIC_NAND, LOGIC_NAND, 0, NAND, Logic Nand},
- {CONT_LOGIC_NOR, LOGIC_NOR, 0, NOR, Logic Nor},
- {CONT_LOGIC_XOR, LOGIC_XOR, 0, XOR, Logic Xor},
- {CONT_LOGIC_XNOR, LOGIC_XNOR, 0, XNOR, Logic Xnor},
+ {CONT_LOGIC_AND, LOGIC_AND, 0, And, Logic And},
+ {CONT_LOGIC_OR, LOGIC_OR, 0, Or, Logic Or},
+ {CONT_LOGIC_NAND, LOGIC_NAND, 0, Nand, Logic Nand},
+ {CONT_LOGIC_NOR, LOGIC_NOR, 0, Nor, Logic Nor},
+ {CONT_LOGIC_XOR, LOGIC_XOR, 0, Xor, Logic Xor},
+ {CONT_LOGIC_XNOR, LOGIC_XNOR, 0, Xnor, Logic Xnor},
{CONT_EXPRESSION, EXPRESSION, 0, Expression, },
{CONT_PYTHON, PYTHON, 0, Python Script, },
{0, NULL, 0, NULL, NULL}};
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30355] trunk/blender/release/scripts: use dict comprehension where possible
Revision: 30355
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30355
Author: campbellbarton
Date: 2010-07-15 02:52:26 +0200 (Thu, 15 Jul 2010)
Log Message:
---
use dict comprehension where possible
Modified Paths:
--
trunk/blender/release/scripts/io/import_scene_3ds.py
trunk/blender/release/scripts/io/import_scene_obj.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/op/uvcalc_follow_active.py
Modified: trunk/blender/release/scripts/io/import_scene_3ds.py
===
--- trunk/blender/release/scripts/io/import_scene_3ds.py2010-07-14
23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/io/import_scene_3ds.py2010-07-15
00:52:26 UTC (rev 30355)
@@ -360,7 +360,7 @@
vertMappingIndex = 0
vertsToUse = [i for i in range(len(myContextMesh_vertls)) if
faceVertUsers[i]]
-myVertMapping = dict( [ (ii, i) for i, ii in enumerate(vertsToUse)
] )
+myVertMapping = {ii: i for i, ii in enumerate(vertsToUse)}
tempName= '%s_%s' % (contextObName, matName) # matName may be None.
bmesh = bpy.data.meshes.new(tempName)
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===
--- trunk/blender/release/scripts/io/import_scene_obj.py2010-07-14
23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/io/import_scene_obj.py2010-07-15
00:52:26 UTC (rev 30355)
@@ -596,7 +596,7 @@
if unique_smooth_groups:
sharp_edges= {}
-smooth_group_users= dict([ (context_smooth_group, {}) for
context_smooth_group in list(unique_smooth_groups.keys()) ])
+smooth_group_users = {context_smooth_group: {} for
context_smooth_group in list(unique_smooth_groups.keys())}
context_smooth_group_old= -1
# Split fgons into tri's
@@ -691,7 +691,7 @@
# map the material names to an index
-material_mapping= dict([(name, i) for i, name in
enumerate(unique_materials)]) # enumerate over unique_materials keys()
+material_mapping = {name: i for i, name in enumerate(unique_materials)} #
enumerate over unique_materials keys()
materials= [None] * len(unique_materials)
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===
--- trunk/blender/release/scripts/modules/bpy_types.py 2010-07-14 23:51:21 UTC
(rev 30354)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2010-07-15 00:52:26 UTC
(rev 30355)
@@ -444,7 +444,7 @@
if not hasattr(edges, pop):
edges = edges[:]
-edge_dict = dict((ed.key, ed) for ed in self.edges if ed.selected)
+edge_dict = {ed.key: ed for ed in self.edges if ed.selected}
while edges:
current_edge = edges.pop()
Modified: trunk/blender/release/scripts/op/uvcalc_follow_active.py
===
--- trunk/blender/release/scripts/op/uvcalc_follow_active.py2010-07-14
23:51:21 UTC (rev 30354)
+++ trunk/blender/release/scripts/op/uvcalc_follow_active.py2010-07-15
00:52:26 UTC (rev 30355)
@@ -65,9 +65,9 @@
# vertex index is the key, uv is the value
-uvs_vhash_source = dict([(vindex, uvs_source[i]) for i, vindex in
enumerate(vidx_source)])
+uvs_vhash_source = {vindex: uvs_source[i] for i, vindex in
enumerate(vidx_source)}
-uvs_vhash_target = dict([(vindex, uvs_target[i]) for i, vindex in
enumerate(vidx_target)])
+uvs_vhash_target = {vindex: uvs_target[i] for i, vindex in
enumerate(vidx_target)}
edge_idxs_source = face_edge_vs(vidx_source)
edge_idxs_target = face_edge_vs(vidx_target)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30356] branches/bmesh/blender/source/ blender/bmesh: [note: do not test quite yet]
Revision: 30356
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30356
Author: joeedh
Date: 2010-07-15 02:55:31 +0200 (Thu, 15 Jul 2010)
Log Message:
---
[note: do not test quite yet]
Phase 1 of restructuring done. There are now two
distinct subclass systems within the bmesh API;
one is compile-time, and forms the backend of what will
eventually be a lite bmesh API for modifiers (the
ones that use bmesh are simply too slow right now).
The other is dynamic, and will be used to implement
multires reprojection.
The idea was to solve as many serious problems with
memory, speed, etc, at once as possible and set up others
to be solved more easily later.
I've also added holes into the data structure, but not
the api; I don't plan to finish implementing that until
after bmesh gets into trunk. I simply wanted to lessen
how much code I'll have to rewrite, since I was doing a
fairly major restructuring anyway.
In addition, I've added iteration support to mempool, to
avoid having to store linked list pointers (though this
has caveats).
Next step: merge in trunk changes. . .oh, what fun :P
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2010-07-15 00:52:26 UTC (rev 30355)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2010-07-15 00:55:31 UTC (rev 30356)
@@ -88,6 +88,53 @@
return 0;
}
+/*
+ * BMESH MAKE MESH
+ *
+ * Allocates a new BMesh structure.
+ * Returns -
+ * Pointer to a BM
+ *
+*/
+
+BMesh *BM_Make_Mesh(int allocsize[4])
+{
+ /*allocate the structure*/
+ BMesh *bm = MEM_callocN(sizeof(BMesh),BM);
+ int vsize, esize, lsize, fsize, lstsize;
+ int baselevel = LAYER_ADJ;
+
+ if (baselevel == LAYER_BASE) {
+ vsize = sizeof(BMBaseVert);
+ esize = sizeof(BMBaseEdge);
+ lsize = sizeof(BMBaseLoop);
+ fsize = sizeof(BMBaseFace);
+ lstsize = sizeof(BMBaseLoopList);
+ } else {
+ vsize = sizeof(BMVert);
+ esize = sizeof(BMEdge);
+ lsize = sizeof(BMLoop);
+ fsize = sizeof(BMFace);
+ lstsize = sizeof(BMLoopList);
+ }
+
+ bm-baselevel = baselevel;
+
+/*allocate the memory pools for the mesh elements*/
+ bm-vpool = BLI_mempool_create(vsize, allocsize[0], allocsize[0], 0, 1);
+ bm-epool = BLI_mempool_create(esize, allocsize[1], allocsize[1], 0, 1);
+ bm-lpool = BLI_mempool_create(lsize, allocsize[2], allocsize[2], 0, 0);
+ bm-looplistpool = BLI_mempool_create(lstsize, allocsize[3],
allocsize[3], 0, 0);
+ bm-fpool = BLI_mempool_create(fsize, allocsize[3], allocsize[3], 0, 1);
+
+ /*allocate one flag pool that we dont get rid of.*/
+ bm-toolflagpool = BLI_mempool_create(sizeof(BMFlagLayer), 512, 512, 0,
0);
+ bm-stackdepth = 0;
+ bm-totflags = 1;
+
+ return bm;
+}
+
/*
* BMESH FREE MESH
*
@@ -129,11 +176,21 @@
/*destroy element pools*/
BLI_mempool_destroy(bm-vpool);
BLI_mempool_destroy(bm-epool);
+ BLI_mempool_destroy(bm-lpool);
BLI_mempool_destroy(bm-fpool);
- BLI_mempool_destroy(bm-lpool);
+ if (bm-svpool)
+ BLI_mempool_destroy(bm-svpool);
+ if (bm-sepool)
+ BLI_mempool_destroy(bm-sepool);
+ if (bm-slpool)
+ BLI_mempool_destroy(bm-slpool);
+ if (bm-sfpool)
+ BLI_mempool_destroy(bm-sfpool);
+
/*destroy flag pool*/
BLI_mempool_destroy(bm-toolflagpool);
+ BLI_mempool_destroy(bm-looplistpool);
BLI_freelistN(bm-selected);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2010-07-15 00:52:26 UTC (rev 30355)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2010-07-15 00:55:31 UTC (rev 30356)
@@ -798,17 +798,17 @@
for(v = BMIter_New(verts, bm, BM_VERTS_OF_MESH, bm); v; v =
BMIter_Step(verts)){
oldflags = v-head.flags;
v-head.flags = BLI_mempool_calloc(bm-toolflagpool);
- memcpy(v-head.flags, oldflags,
sizeof(BMFlagLayer)*bm-totflags); /*dont know if this memcpy usage is correct*/
+ memcpy(v-head.flags, oldflags,
sizeof(BMFlagLayer)*(bm-totflags-1));
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30358] branches/bmesh/blender/source/ blender/bmesh: forgot these
Revision: 30358
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30358
Author: joeedh
Date: 2010-07-15 03:43:09 +0200 (Thu, 15 Jul 2010)
Log Message:
---
forgot these
Added Paths:
---
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
Added: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
(rev 0)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h 2010-07-15
01:43:09 UTC (rev 30358)
@@ -0,0 +1,264 @@
+#ifndef _BMESH_CLASS_H
+#define _BMESH_CLASS_H
+
+#include DNA_listBase.h
+#include DNA_customdata_types.h
+
+struct BMesh;
+struct BMVert;
+struct BMEdge;
+struct BMLoop;
+struct BMFace;
+struct BMBaseVert;
+struct BMBaseEdge;
+struct BMBaseLoop;
+struct BMBaseFace;
+struct BMLayerType;
+struct BMSubClassLayer;
+struct BMFlagLayer;
+struct BLI_mempool;
+
+/*
+ok: we have a simple subclassing system, to layer in bmesh api features (and
+let people subclass the api). There's also a separate, compile-time system
+that will end up being the back-end to a lite bmesh API for modifiers.
+
+there are two seperate and distinct subtyping strategies here. one is with
+macros and struct inheritence, and the other is more dynamic. this is because
+of two competing motivations for subclassing: the ability to code faster,
+less memory intensive BMTools that don't use adjacency info, and the ability
+to hook into higher-level API functions for things like multires interpolation,
+which needs much more then what is provided in the CustomData API.
+
+The first strategy is part of a plan to replace CDDM with a bmesh-like API
+(which is much easier for me then rewriting array, mirror, in CDDM, which
+would be a huge pain).
+*/
+
+/*note: it is very important for BMHeader to start with two
+ pointers. this is a requirement of mempool's method of
+ iteration.
+*/
+typedef struct BMHeader {
+ void *data; /*customdata layers*/
+ void *layerdata; /*dynamic subclass data, doesn't include BMTool and
adjacency which use a static compile-time method */
+ int eid; /*element id*/
+ short type; /*element geometric type (verts/edges/loops/faces)*/
+ short flag; /*this would be a CD layer, see below*/
+ short eflag1, eflag2;
+ int sysflag, index; /*note: do *not* touch sysflag! and use
BMINDEX_GET/SET macros for index*/
+ struct BMFlagLayer *flags;
+} BMHeader;
+
+/*note: need some way to specify custom locations for custom data layers. so
we can
+make them point directly into structs. and some way to make it only happen to
the
+active layer, and properly update when switching active layers.*/
+
+/*alloc type a: smallest mesh possible*/
+#define BM_BASE_VHEAD\
+ BMHeader head;\
+ float co[3];\
+ float no[3];
+
+typedef struct BMBaseVert {
+ BM_BASE_VHEAD
+} BMBaseVert;
+
+#define BM_BASE_EHEAD(vtype)\
+ BMHeader head;\
+ struct vtype *v1, *v2;
+
+typedef struct BMBaseEdge {
+ BM_BASE_EHEAD(BMBaseVert)
+} BMBaseEdge;
+
+#define BM_BASE_LHEAD(vtype, etype, ltype)\
+ BMHeader head;\
+ struct vtype *v;\
+ struct etype *e;\
+ struct ltype *next, *prev; /*won't be able to use listbase API, ger,
due to head*/\
+ int _index; /*used for sorting during tesselation*/
+
+typedef struct BMBaseLoop {
+ BM_BASE_LHEAD(BMBaseVert, BMBaseEdge, BMBaseLoop)
+} BMBaseLoop;
+
+#define BM_BASE_LSTHEAD(listtype, looptype)\
+ struct listtype *next, *prev;\
+ struct looptype *first, *last;
+
+typedef struct BMBaseLoopList {
+ BM_BASE_LSTHEAD(BMBaseLoopList, BMBaseLoop)
+} BMBaseLoopList;
+
+#define BM_BASE_FHEAD\
+ BMHeader head;\
+ int len; /*includes all boundary loops*/\
+ int totbounds; /*total boundaries, is one plus the number of holes in
the face*/\
+ ListBase loops;\
+ float no[3]; /*yes, we do store this here*/\
+ short mat_nr;
+
+typedef struct BMBaseFace {
+ BM_BASE_FHEAD
+} BMBaseFace;
+
+typedef struct BMFlagLayer {
+ short f, pflag; /*flags*/
+ int index; /*generic index*/
+} BMFlagLayer;
+
+#define BM_ADJ_VHEAD(etype)\
+ BM_BASE_VHEAD\
+ struct etype *e;
+
+typedef struct BMVert {
+ BM_ADJ_VHEAD(BMEdge)
+} BMVert;
+
+#define BM_ADJ_EHEAD(vtype, etype, ltype)\
+ BM_BASE_EHEAD(vtype)\
+ struct ltype *l;\
+ /*disk cycle pointers*/\
+ struct {\
+ struct etype *next, *prev;\
+ } dlink1;\
+ struct {\
+ struct etype *next, *prev;\
+ } dlink2;
+
+typedef struct BMEdge {
+ BM_ADJ_EHEAD(BMVert, BMEdge, BMLoop)
+} BMEdge;
+
+#define BM_ADJ_LHEAD(vtype, etype, ltype, ftype)\
+ BM_BASE_LHEAD(vtype, etype, ltype)\
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30359] branches/soc-2010-leifandersen/ tests/render: 1.
Revision: 30359 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30359 Author: leifandersen Date: 2010-07-15 04:42:33 +0200 (Thu, 15 Jul 2010) Log Message: --- 1. Didn't realize the images were removed...so I put them back in, as they really should be there, as they are part of the CTest testing. (The animations aren't, they take far too long, and thus can be generated or downloaded seperately). 2. Fixed the rest of the bugs (I think), unless someone points out another bug, all that is left, is writing the README, and than I'll package it up, and submit it for testing. Modified Paths: -- branches/soc-2010-leifandersen/tests/render/run.py Added Paths: --- branches/soc-2010-leifandersen/tests/render/README.txt branches/soc-2010-leifandersen/tests/render/render/Raptor_radio_ray_env_0001.png branches/soc-2010-leifandersen/tests/render/render/arealight_0001.png branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes_0001.png branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_0001.png branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_cubes_0001.png branches/soc-2010-leifandersen/tests/render/render/compo_map_zcombine_cubes_0001.png branches/soc-2010-leifandersen/tests/render/render/composite_image_0001.png branches/soc-2010-leifandersen/tests/render/render/composite_layers_0001.png branches/soc-2010-leifandersen/tests/render/render/deformtest_0001.png branches/soc-2010-leifandersen/tests/render/render/displace_0001.png branches/soc-2010-leifandersen/tests/render/render/dupliverts_0001.png branches/soc-2010-leifandersen/tests/render/render/flaretest_0001.png branches/soc-2010-leifandersen/tests/render/render/flippedmatrixes_0001.png branches/soc-2010-leifandersen/tests/render/render/halostep_0001.png branches/soc-2010-leifandersen/tests/render/render/mirror_texture_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_bake_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_compo_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_light-passes_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_passes_0001.png branches/soc-2010-leifandersen/tests/render/render/monkey_cornelius_shadbuf_0001.png branches/soc-2010-leifandersen/tests/render/render/motor9_0001.png branches/soc-2010-leifandersen/tests/render/render/nodelib_0001.png branches/soc-2010-leifandersen/tests/render/render/only_shadow_lamp_0001.png branches/soc-2010-leifandersen/tests/render/render/only_shadow_material_0001.png branches/soc-2010-leifandersen/tests/render/render/refract_monkey_0001.png branches/soc-2010-leifandersen/tests/render/render/sss_0001.png branches/soc-2010-leifandersen/tests/render/render/teapot_envmap_0001.png branches/soc-2010-leifandersen/tests/render/render/teapot_soft_0001.png branches/soc-2010-leifandersen/tests/render/render/text-regression_0001.png branches/soc-2010-leifandersen/tests/render/render/windows_tra_shadow.png_0001.png branches/soc-2010-leifandersen/tests/render/render/windows_tra_shadow_0001.png Added: branches/soc-2010-leifandersen/tests/render/README.txt === Added: branches/soc-2010-leifandersen/tests/render/render/Raptor_radio_ray_env_0001.png === (Binary files differ) Property changes on: branches/soc-2010-leifandersen/tests/render/render/Raptor_radio_ray_env_0001.png ___ Name: svn:mime-type + application/octet-stream Added: branches/soc-2010-leifandersen/tests/render/render/arealight_0001.png === (Binary files differ) Property changes on: branches/soc-2010-leifandersen/tests/render/render/arealight_0001.png ___ Name: svn:mime-type + application/octet-stream Added: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes_0001.png === (Binary files differ) Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_idmask_cubes_0001.png ___ Name: svn:mime-type + application/octet-stream Added: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_0001.png === (Binary files differ) Property changes on: branches/soc-2010-leifandersen/tests/render/render/compo_map_uv_0001.png
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30360] branches/soc-2010-leifandersen/ tests/render/run.py: 1.
Revision: 30360
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30360
Author: leifandersen
Date: 2010-07-15 05:00:38 +0200 (Thu, 15 Jul 2010)
Log Message:
---
1. Images now viable in browsers where file:// isn't automatically appended to
images and links in an absolute path. Of course...this means the folder still
can't be moved.
Now I think all of the bugs are gone.
Modified Paths:
--
branches/soc-2010-leifandersen/tests/render/run.py
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-15 02:42:33 UTC
(rev 30359)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-15 03:00:38 UTC
(rev 30360)
@@ -487,9 +487,9 @@
for frame in animation.good_path_arr:
file.write('tr\n')
file.write('td Frame: ' + str(i) + '/td\n')
-file.write('tda href=' + animation.good_path_arr[i-1] + 'img
src=' + animation.good_path_arr[i-1] + ' alt=Good Image width=200
height=150/a/td\n')
-file.write('tda href=' + animation.test_path_arr[i-1] + 'img
src=' + animation.test_path_arr[i-1] + ' alt=Latest Render width=200
height=150/a/td\n')
-file.write('tda href=' + animation.diff_path_arr[i-1] + 'img
src=' + animation.diff_path_arr[i-1] + ' alt=Image Diff width=200
height=150/a/td\n')
+file.write('tda href=file://' + animation.good_path_arr[i-1] +
'img src=file://' + animation.good_path_arr[i-1] + ' alt=Good Image
width=200 height=150/a/td\n')
+file.write('tda href=file://' + animation.test_path_arr[i-1] +
'img src=file://' + animation.test_path_arr[i-1] + ' alt=Latest Render
width=200 height=150/a/td\n')
+file.write('tda href=file://' + animation.diff_path_arr[i-1] +
'img src=file://' + animation.diff_path_arr[i-1] + ' alt=Image Diff
width=200 height=150/a/td\n')
file.write('td')
if animation.passed_arr[i-1]:
file.write('font color=ooffooOK/font: ' +
str(animation.bad_pixels_arr[i-1]) + ' of ' +
str(animation.pixel_count_arr[i-1]) + ' pixels different, ' +
str(animation.difference) + '% different.')
@@ -540,9 +540,9 @@
else:
file.write('td' + image.name + '/td\n')
if image.mode == 'Image':
-file.write('tda href=' + image.good_path + 'img src='
+ image.good_path + ' alt=Good Image width=200 height=150/a/td\n')
-file.write('tda href=' + image.test_path + 'img src='
+ image.test_path + ' alt=Latest Render width=200
height=150/a/td\n')
-file.write('tda href=' + image.diff_path + 'img src='
+ image.diff_path + ' alt=Image Diff width=200 height=150/a/td\n')
+file.write('tda href=file://' + image.good_path + 'img
src=file://' + image.good_path + ' alt=Good Image width=200
height=150/a/td\n')
+file.write('tda href=file://' + image.test_path + 'img
src=file://' + image.test_path + ' alt=Latest Render width=200
height=150/a/td\n')
+file.write('tda href=file://' + image.diff_path + 'img
src=file://' + image.diff_path + ' alt=Image Diff width=200
height=150/a/td\n')
elif image.mode == 'Hash':
file.write('td' + str(image.good_hash) + '/td')
file.write('td' + str(image.test_hash) + '/td')
@@ -573,9 +573,9 @@
else:
file.write('td' + image.name + '/td\n')
if image.mode == 'Image':
-file.write('tda href=' + image.good_path + 'img src='
+ image.good_path + ' alt=Good Image width=200 height=150/a/td\n')
-file.write('tda href=' + image.test_path + 'img src='
+ image.test_path + ' alt=Latest Render width=200
height=150/a/td\n')
-file.write('tda href=' + image.diff_path + 'img src='
+ image.diff_path + ' alt=Image Diff width=200 height=150/a/td\n')
+file.write('tda href=file://' + image.good_path + 'img
src=file://' + image.good_path + ' alt=Good Image width=200
height=150/a/td\n')
+file.write('tda href=file://' + image.test_path + 'img
src=file://' + image.test_path + ' alt=Latest Render width=200
height=150/a/td\n')
+file.write('tda href=file://' + image.diff_path + 'img
src=file://' + image.diff_path + ' alt=Image Diff width=200
height=150/a/td\n')
elif image.mode == 'Hash':
file.write('td' + str(image.good_hash) + '/td')
file.write('td' + str(image.test_hash) + '/td')
@@ -688,7 +688,7 @@
print 'FAILED'
# Output Result
-if not options.building_tests:
+if not options.building_tests and len(args) 0:
print 'Generating Output'
generate_output(cases, os.path.join(HTML_OUTPUT, 'index.html'))
console_output(cases, options.building_tests, False)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30362] branches/soc-2010-leifandersen/ tests/render: 1.
Revision: 30362 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30362 Author: leifandersen Date: 2010-07-15 05:35:52 +0200 (Thu, 15 Jul 2010) Log Message: --- 1. Let -b be a flag for --blender-bin 2. Wrote the first draft of the readme (in READEME.txt) Modified Paths: -- branches/soc-2010-leifandersen/tests/render/README.txt branches/soc-2010-leifandersen/tests/render/run.py Modified: branches/soc-2010-leifandersen/tests/render/README.txt === --- branches/soc-2010-leifandersen/tests/render/README.txt 2010-07-15 03:08:15 UTC (rev 30361) +++ branches/soc-2010-leifandersen/tests/render/README.txt 2010-07-15 03:35:52 UTC (rev 30362) @@ -0,0 +1,59 @@ +~Blender Render Regression Test Tool~ +The Blender Render Regression Test Tool is a tool to help busy developers quickly run render based regression tests on blender, as well as aiding in the creation of more generic unit testing tools where Render Tests are needed. + + +Requirements: +To run these tests you need: + - python 2.x, and all of the associated libs + - PIL (Python Imaging Library), for whatever version of python you have + + +Quickstart: +The images required to compare image tests are built into the package, simply go into the test directory and run: + + python run.py + +if blender is not in your path run: + + python run.py -b Location of your testing blender binary + + +Running the animation tests: +The animation tests require much more space, and take much longer to run. However, on the off chance you do want to run them, you can use the --with-animations flag in order to run your animation suite. Go get a coffee, or a full blown out meal while your waiting though, or you could get some other work done, these tests will take a long time to complete. + +Because of the size of these tests, the needed images to compile them were not included in this package. In order to get them, download the animation_images package, and extract it to the same location you placed this folder in your filesystem. If you don't want to download the tests, and you have a good copy of blender on your system, you can build the needed files, simply run: + + python run.py --build-tests --with-animations + +or if the good blender binary is not in your path, run: + + python run.py --blender-tests --with-animations --good-blender-bin=Your good blender binary + +However, this option will take a long time as well. Note that when running the animation tests, you will see the output blender gives as the animation is rendering. + + +Viewing the test output: +The tests report whether or not they passed while they are running, but more data can be viewed with an HTML file the tests generate. This file gives a list of the pixels that can be considered different, as well as the percentage of difference for each image. It also shows the good image along side the most recent test image, and a diff of the two images. Finally, if the test was an animation, the name of the test becomes a link to another HTML file, containing this data for every frame in the animation. + +Note that this feature is still a bit buggy, and while the webpage is still very usable in most browsers, many will not output a page that has a completely clean theme. + + +Running additional images and animations: +The suite is also capable of running additional animations and images outside of the ones in the folder. To use this mode simply use the -i or -a (but not both) flags to represent image and animation respectively. Then, simply insert the location of the blend file you would like to compare. + +Note that a specific file structure is still required for these tests to work properly. For images, it expects there to be a folder in the same directory the blend file is in, named 'render', in it, it expects a png file of the same name as the blend file, except replacing .blend with _0001.png. For animations, it requires a folder with the same name of the blend file (without the blend), with PNG output of the blend file. Note that you need to use the default settings for these png files for the tests to work properly. + + +Odds and ends: +-v shows the output of blender as it renders single images, and -h shows a list of all the parameters. + + +Final notes: +This suite was made by Leif Andersen for the Blender Foundation as a GSoC (Google Summer of Code) project. For more information, or to contact me, you can go to: + - http://wiki.blender.org/index.php/User:LeifAndersen/GSoC2010 + +and if that's off line for some reason, you can probably also find me at: + - http://leifandersen.net + +I also am on #blendercoders and many other Freenode channels, my nick is Leif + Modified: branches/soc-2010-leifandersen/tests/render/run.py
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30363] branches/soc-2010-leifandersen/ tests/render: Okay, a few more bugs (am I committing too often?)
Revision: 30363
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30363
Author: leifandersen
Date: 2010-07-15 05:43:21 +0200 (Thu, 15 Jul 2010)
Log Message:
---
Okay, a few more bugs (am I committing too often?)
1. Now we're only generating HTML output if no extra files are added to the
test case with -i or -a.
2. added style.css (ugly...to be changed...)
Modified Paths:
--
branches/soc-2010-leifandersen/tests/render/run.py
Added Paths:
---
branches/soc-2010-leifandersen/tests/render/style.css
Modified: branches/soc-2010-leifandersen/tests/render/run.py
===
--- branches/soc-2010-leifandersen/tests/render/run.py 2010-07-15 03:35:52 UTC
(rev 30362)
+++ branches/soc-2010-leifandersen/tests/render/run.py 2010-07-15 03:43:21 UTC
(rev 30363)
@@ -688,7 +688,7 @@
print 'FAILED'
# Output Result
-if not options.building_tests and len(args) 0:
+if not options.building_tests and len(args) == 0:
print 'Generating Output'
generate_output(cases, os.path.join(HTML_OUTPUT, 'index.html'))
console_output(cases, options.building_tests, False)
Added: branches/soc-2010-leifandersen/tests/render/style.css
===
--- branches/soc-2010-leifandersen/tests/render/style.css
(rev 0)
+++ branches/soc-2010-leifandersen/tests/render/style.css 2010-07-15
03:43:21 UTC (rev 30363)
@@ -0,0 +1,113 @@
+#navcontainer {height: 50px;margin: 0 auto;position: relative;width: 980px;}
+#navcontainer img {width: 140px;height: 50px;}
+#pageheader {background-image:url(bg.png);height:80px;position:relative;}
+body {font-family: Lucida Grande,Lucida Sans Unicode,Lucida
Sans,Lucida,Verdana,sans-serif;font-size: 12px;line-height:
145%;background-color: #00;color: #ff;min-width: 980px;margin:
0;padding: 0;}
+div.document {margin:20px auto
0;position:relative;text-align:left;width:980px;/*background-color:
#1c4e63;*/}
+div.documentwrapper {float: left;width: 100%;background-color:
#232323;border-color: #363636;border-style:solid;border-width:0 1px;margin:0
auto;min-height:30em;padding:35px;/*
position:relative;*/text-align:left;width:908px;}
+div.bodywrapper {margin: 0 0 0 230px;}
+div.body {background-color: #232323;color: #ff;padding: 0;width: 640px;}
+div.bodywrapper {margin: 0 230px 0 0;}
+div.footer {background: #292929;border-left: 1px solid #363636;border-right:
1px solid #363636color: #ff;/*width: 100%;*/margin: 0 auto;padding:
20px 20px 15px 35px;text-align: center;font-size: 75%;}
+div.footer+.round b {display: block;background: #292929;width: auto;}
+div.footer+.round #r1 {border-left: 1px solid #363636;border-right: 1px solid
#363636;height: 2px;margin: 0 1px;}
+div.footer+.round #r2 {border-left: 1px solid #363636;border-right: 1px solid
#363636;height: 1px;margin: 0 2px;}
+div.footer+.round #r3 {border-left: 1px solid #363636;border-right: 1px solid
#363636;height: 1px;margin: 0 3px;}
+div.footer+.round #r4 {border-bottom: 1px solid #363636;height: 0px;margin: 0
5px;}
+div.footer a {color: #ff;text-decoration: underline;}
+.boxheader {background-color:#3E4D5E;}
+.subnav {height:auto !important;min-height:15px;padding:9px 0px 9px
37px;position:relative;}
+div.related {width:auto;font-size:100%;font-weight:400;background-color:
#2C3845;line-height: 145%;color: #D3E0E9;}
+div.related li {font-size:0.9em;}
+div.related li.right {margin: 0;word-spacing: 3px;}
+div.subnav li {display:inline;list-style-type:none;margin:0;padding:0 7px 0 0;}
+div.subnav ul {display:inline;margin:0;padding:0;}
+.subnav a {font-weight: bold;color: #fff;}
+.subnav li.subnav-active a {color:#F39410;}
+div.related a {color: #D3E0E9;}
+div.related a:active {color: #f39410;}
+a {color: #97b9cf;text-decoration: none;}
+a:hover {text-decoration: underline;}
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {font-family: Lucida Grande,Lucida Sans Unicode,Lucida
Sans,Lucida,Verdana,sans-serif;background-color: #232323;font-weight:
bold;color: #ff;/*border-bottom: 1px solid #ccc;*/margin: 20px -20px
10px -20px;padding: 3px 0 3px 10px;}
+div.body h1 { margin-top: 0; font-size: 200%;
color:#FFFAE0;font-family:Helvetica,Arial,sans-serif;font-size:34px;font-weight:normal;left:32px;line-height:26px;margin-top:0;position:absolute;top:36px;}
+div.body h2 { font-size: 160%; }
+div.body h3 { font-size: 140%; }
+div.body h4 { font-size: 120%; }
+div.body h5 { font-size: 110%; }
+div.body h6 { font-size: 100%; }
+a.headerlink {color: #97b9cf;font-size: 0.8em;padding: 0 4px 0
4px;text-decoration: none;}
+h1:hover a.headerlink {display:none;}
+a.headerlink:hover {background-color: #97b9cf;color: white;}
+div.body p, div.body dd, div.body li {text-align: justify;line-height: 130%;}
+div.note,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30364] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: Disabled mode-switching keys during 3D View orbit/zoom etc.
Revision: 30364 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30364 Author: broken Date: 2010-07-15 05:49:32 +0200 (Thu, 15 Jul 2010) Log Message: --- Disabled mode-switching keys during 3D View orbit/zoom etc. in default key map. Still possible to re-enable via editing the modal keymap, but was getting a bit annoying in its current state. Can probably be implemented a bit better in the future with timers etc, but no time at the moment. Modified Paths: -- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2010-07-15 03:43:21 UTC (rev 30363) +++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2010-07-15 03:49:32 UTC (rev 30364) @@ -490,9 +490,11 @@ WM_modalkeymap_add_item(keymap, LEFTALTKEY, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_AXIS_SNAP_ENABLE); WM_modalkeymap_add_item(keymap, LEFTALTKEY, KM_RELEASE, KM_ANY, 0, VIEWROT_MODAL_AXIS_SNAP_DISABLE); + /* disabled mode switching for now, can re-implement better, later on WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ZOOM); WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ZOOM); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_MOVE); + */ /* assign map to operators */ WM_modalkeymap_assign(keymap, VIEW3D_OT_rotate); @@ -796,9 +798,11 @@ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, VIEW_MODAL_CONFIRM); + /* disabled mode switching for now, can re-implement better, later on WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ZOOM); WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ZOOM); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ROTATE); + */ /* assign map to operators */ WM_modalkeymap_assign(keymap, VIEW3D_OT_move); @@ -936,9 +940,11 @@ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, VIEW_MODAL_CONFIRM); + /* disabled mode switching for now, can re-implement better, later on WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ROTATE); WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_RELEASE, KM_ANY, 0, VIEWROT_MODAL_SWITCH_ROTATE); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, VIEWROT_MODAL_SWITCH_MOVE); +*/ /* assign map to operators */ WM_modalkeymap_assign(keymap, VIEW3D_OT_zoom); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30365] branches/soc-2010-jwilkins/source/ blender/editors: * smooth strengths below .5 had no effect
Revision: 30365
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30365
Author: jwilkins
Date: 2010-07-15 07:28:33 +0200 (Thu, 15 Jul 2010)
Log Message:
---
* smooth strengths below .5 had no effect
Modified Paths:
--
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
Modified:
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
===
---
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
2010-07-15 03:49:32 UTC (rev 30364)
+++
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
2010-07-15 05:28:33 UTC (rev 30365)
@@ -413,9 +413,8 @@
uiLayoutRow(layout, 1);
- } else
-
- if(flag UI_ID_BROWSE) {
+ }
+ else if(flag UI_ID_BROWSE) {
but= uiDefBlockButN(block, id_search_menu,
MEM_dupallocN(template), , 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y, Browse ID data);
if(type) {
but-icon= RNA_struct_ui_icon(type);
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-15 03:49:32 UTC (rev 30364)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-15 05:28:33 UTC (rev 30365)
@@ -1169,7 +1169,7 @@
count = (int)(bstrength*max_iterations);
last = max_iterations*(bstrength - count*fract);
- for(iteration = 1; iteration = count; ++iteration) {
+ for(iteration = 0; iteration = count; ++iteration) {
#pragma omp parallel for schedule(guided) if (sd-flags
SCULPT_USE_OPENMP)
for(n=0; ntotnode; n++) {
if(ss-multires) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30366] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: * smooth wasn' t working with strengths below .5
Revision: 30366
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=30366
Author: jwilkins
Date: 2010-07-15 07:53:11 +0200 (Thu, 15 Jul 2010)
Log Message:
---
* smooth wasn't working with strengths below .5
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-15
05:28:33 UTC (rev 30365)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2010-07-15
05:53:11 UTC (rev 30366)
@@ -1169,7 +1169,7 @@
count = (int)(bstrength*max_iterations);
last = max_iterations*(bstrength - count*fract);
- for(iteration = 1; iteration = count; ++iteration) {
+ for(iteration = 0; iteration = count; ++iteration) {
#pragma omp parallel for schedule(guided) if (sd-flags
SCULPT_USE_OPENMP)
for(n=0; ntotnode; n++) {
if(ss-multires) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
