[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30323] branches/soc-2010-nexyon: svn merge -r 30262:30322 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Joerg Mueller
nexyon at gmail.com
Wed Jul 14 14:40:47 CEST 2010
Revision: 30323
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30323
Author: nexyon
Date: 2010-07-14 14:40:46 +0200 (Wed, 14 Jul 2010)
Log Message:
-----------
svn merge -r 30262:30322 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-nexyon/doc/blender.1.py
branches/soc-2010-nexyon/extern/libopenjpeg/dwt.c
branches/soc-2010-nexyon/release/scripts/io/export_3ds.py
branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
branches/soc-2010-nexyon/release/scripts/io/export_mdd.py
branches/soc-2010-nexyon/release/scripts/io/export_obj.py
branches/soc-2010-nexyon/release/scripts/io/export_ply.py
branches/soc-2010-nexyon/release/scripts/io/export_x3d.py
branches/soc-2010-nexyon/release/scripts/modules/rna_info.py
branches/soc-2010-nexyon/release/scripts/op/object.py
branches/soc-2010-nexyon/release/scripts/op/presets.py
branches/soc-2010-nexyon/release/scripts/op/uv.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nexyon/release/scripts/ui/space_sequencer.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d.py
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-nexyon/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/font.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/material.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/mball.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/object.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/scene.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframing.c
branches/soc-2010-nexyon/source/blender/editors/armature/armature_intern.h
branches/soc-2010-nexyon/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseobject.c
branches/soc-2010-nexyon/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nexyon/source/blender/editors/curve/editfont.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_regions.c
branches/soc-2010-nexyon/source/blender/editors/object/object_add.c
branches/soc-2010-nexyon/source/blender/editors/object/object_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_relations.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nexyon/source/blender/editors/space_file/filelist.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nexyon/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-nexyon/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_init_exit.c
Added Paths:
-----------
branches/soc-2010-nexyon/source/blender/gpu/GPU_buffers.h
Removed Paths:
-------------
branches/soc-2010-nexyon/source/blender/gpu/gpu_buffers.h
Modified: branches/soc-2010-nexyon/doc/blender.1.py
===================================================================
--- branches/soc-2010-nexyon/doc/blender.1.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/doc/blender.1.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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/soc-2010-nexyon/extern/libopenjpeg/dwt.c
===================================================================
--- branches/soc-2010-nexyon/extern/libopenjpeg/dwt.c 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/extern/libopenjpeg/dwt.c 2010-07-14 12:40:46 UTC (rev 30323)
@@ -610,7 +610,7 @@
int i;
for(i = 0; i < count; ++i){
__m128 tmp = vw[i*2];
- vw[i*2] = tmp * c;
+ vw[i*2] = _mm_mul_ps(tmp, c);
}
}
@@ -622,18 +622,18 @@
__m128 tmp1 = vl[ 0];
__m128 tmp2 = vw[-1];
__m128 tmp3 = vw[ 0];
- vw[-1] = tmp2 + ((tmp1 + tmp3) * c);
+ vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
vl = vw;
vw += 2;
}
if(m >= k){
return;
}
- c += c;
- c *= vl[0];
+ c = _mm_add_ps(c, c);
+ c = _mm_mul_ps(c, vl[0]);
for(; m < k; ++m){
__m128 tmp = vw[-1];
- vw[-1] = tmp + c;
+ vw[-1] = _mm_add_ps(tmp, c);
vw += 2;
}
}
Modified: branches/soc-2010-nexyon/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_3ds.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_3ds.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/io/export_mdd.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_mdd.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_mdd.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/io/export_obj.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_obj.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_obj.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/io/export_ply.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_ply.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_ply.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/io/export_x3d.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_x3d.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/io/export_x3d.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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: branches/soc-2010-nexyon/release/scripts/modules/rna_info.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/modules/rna_info.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/modules/rna_info.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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/soc-2010-nexyon/release/scripts/op/object.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/op/object.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/op/object.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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/soc-2010-nexyon/release/scripts/op/presets.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/op/presets.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/op/presets.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -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/soc-2010-nexyon/release/scripts/op/uv.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/op/uv.py 2010-07-14 12:35:55 UTC (rev 30322)
+++ branches/soc-2010-nexyon/release/scripts/op/uv.py 2010-07-14 12:40:46 UTC (rev 30323)
@@ -210,7 +210,8 @@
def menu_func(self, context):
- default_path = bpy.data.filepath.replace(".blend", ".svg")
+ import os
+ default_path = os.path.splitext(bpy.data.filepath)[0] + ".svg"
self.layout.operator(ExportUVLayout.bl_idname).filepath = default_path
Modified: branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list