[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30718] branches/soc-2010-nexyon: svn merge -r 30566:30717 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Joerg Mueller
nexyon at gmail.com
Sun Jul 25 15:12:58 CEST 2010
Revision: 30718
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30718
Author: nexyon
Date: 2010-07-25 15:12:58 +0200 (Sun, 25 Jul 2010)
Log Message:
-----------
svn merge -r 30566:30717 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-nexyon/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-nexyon/intern/smoke/intern/FLUID_3D.h
branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
branches/soc-2010-nexyon/release/scripts/io/import_scene_obj.py
branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py
branches/soc-2010-nexyon/release/scripts/op/object.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nexyon/release/scripts/ui/space_image.py
branches/soc-2010-nexyon/release/scripts/ui/space_sequencer.py
branches/soc-2010-nexyon/release/scripts/ui/space_userpref.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_sequencer.h
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/brush.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/displist.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/key.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/library.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/seqeffects.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature.c
branches/soc-2010-nexyon/source/blender/editors/curve/editcurve.c
branches/soc-2010-nexyon/source/blender/editors/curve/editfont.c
branches/soc-2010-nexyon/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-nexyon/source/blender/editors/include/ED_curve.h
branches/soc-2010-nexyon/source/blender/editors/include/ED_sculpt.h
branches/soc-2010-nexyon/source/blender/editors/interface/interface.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nexyon/source/blender/editors/interface/resources.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nexyon/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_select.c
branches/soc-2010-nexyon/source/blender/editors/object/object_transform.c
branches/soc-2010-nexyon/source/blender/editors/physics/particle_edit.c
branches/soc-2010-nexyon/source/blender/editors/render/render_shading.c
branches/soc-2010-nexyon/source/blender/editors/screen/area.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_intern.h
branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nexyon/source/blender/editors/space_file/file_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_info/info_stats.c
branches/soc-2010-nexyon/source/blender/editors/space_info/space_info.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_select.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_input.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-nexyon/source/blender/editors/util/undo.c
branches/soc-2010-nexyon/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nexyon/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2010-nexyon/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-nexyon/source/blender/makesrna/SConscript
branches/soc-2010-nexyon/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-nexyon/source/blender/makesrna/intern/Makefile
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_camera.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-nexyon/source/blender/nodes/intern/CMP_util.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils.h
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna.h
branches/soc-2010-nexyon/source/blender/render/intern/include/render_types.h
branches/soc-2010-nexyon/source/blender/render/intern/include/volume_precache.h
branches/soc-2010-nexyon/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nexyon/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2010-nexyon/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nexyon/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-nexyon/source/blender/render/intern/source/volume_precache.c
branches/soc-2010-nexyon/source/blender/render/intern/source/volumetric.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nexyon/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nexyon/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-nexyon/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-nexyon/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2010-nexyon/source/gameengine/Ketsji/KX_Dome.cpp
Added Paths:
-----------
branches/soc-2010-nexyon/source/blender/blenkernel/intern/seqcache.c
Modified: branches/soc-2010-nexyon/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2010-nexyon/intern/guardedalloc/MEM_guardedalloc.h 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/intern/guardedalloc/MEM_guardedalloc.h 2010-07-25 13:12:58 UTC (rev 30718)
@@ -63,7 +63,7 @@
extern "C" {
#endif
- /** Returns the lenght of the allocated memory segment pointed at
+ /** Returns the length of the allocated memory segment pointed at
* by vmemh. If the pointer was not previously allocated by this
* module, the result is undefined.*/
size_t MEM_allocN_len(void *vmemh);
Modified: branches/soc-2010-nexyon/intern/smoke/intern/FLUID_3D.h
===================================================================
--- branches/soc-2010-nexyon/intern/smoke/intern/FLUID_3D.h 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/intern/smoke/intern/FLUID_3D.h 2010-07-25 13:12:58 UTC (rev 30718)
@@ -30,6 +30,7 @@
#include <cstdlib>
#include <cmath>
+#include <cstring>
#include <iostream>
#include "OBSTACLE.h"
// #include "WTURBULENCE.h"
Modified: branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -947,10 +947,7 @@
render = scene.render
width = render.resolution_x
height = render.resolution_y
-# render = scene.render
-# width = render.sizeX
-# height = render.sizeY
- aspect = float(width)/height
+ aspect = width / height
data = my_cam.blenObject.data
@@ -962,11 +959,9 @@
file.write('\n\t\t\tProperty: "FieldOfView", "FieldOfView", "A+",%.6f' % math.degrees(data.angle))
file.write('\n\t\t\tProperty: "FieldOfViewX", "FieldOfView", "A+",1')
file.write('\n\t\t\tProperty: "FieldOfViewY", "FieldOfView", "A+",1')
- file.write('\n\t\t\tProperty: "FocalLength", "Real", "A+",14.0323972702026')
+ # file.write('\n\t\t\tProperty: "FocalLength", "Real", "A+",14.0323972702026')
file.write('\n\t\t\tProperty: "OpticalCenterX", "Real", "A+",%.6f' % data.shift_x) # not sure if this is in the correct units?
-# file.write('\n\t\t\tProperty: "OpticalCenterX", "Real", "A+",%.6f' % data.shiftX) # not sure if this is in the correct units?
file.write('\n\t\t\tProperty: "OpticalCenterY", "Real", "A+",%.6f' % data.shift_y) # ditto
-# file.write('\n\t\t\tProperty: "OpticalCenterY", "Real", "A+",%.6f' % data.shiftY) # ditto
file.write('\n\t\t\tProperty: "BackgroundColor", "Color", "A+",0,0,0')
file.write('\n\t\t\tProperty: "TurnTable", "Real", "A+",0')
file.write('\n\t\t\tProperty: "DisplayTurnTableIcon", "bool", "",1')
@@ -975,7 +970,7 @@
file.write('\n\t\t\tProperty: "UseRealTimeMotionBlur", "bool", "",1')
file.write('\n\t\t\tProperty: "ResolutionMode", "enum", "",0')
file.write('\n\t\t\tProperty: "ApertureMode", "enum", "",2')
- file.write('\n\t\t\tProperty: "GateFit", "enum", "",0')
+ file.write('\n\t\t\tProperty: "GateFit", "enum", "",2')
file.write('\n\t\t\tProperty: "CameraFormat", "enum", "",0')
file.write('\n\t\t\tProperty: "AspectW", "double", "",%i' % width)
file.write('\n\t\t\tProperty: "AspectH", "double", "",%i' % height)
@@ -2782,7 +2777,7 @@
# Set the action active
for my_bone in ob_arms:
- if blenAction in my_bone.blenActionList:
+ if ob.animation_data and blenAction in my_bone.blenActionList:
ob.animation_data.action = blenAction
# print '\t\tSetting Action!', blenAction
# scene.update(1)
Modified: branches/soc-2010-nexyon/release/scripts/io/import_scene_obj.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/import_scene_obj.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/io/import_scene_obj.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -420,8 +420,7 @@
# Add an MTL with the same name as the obj if no MTLs are spesified.
temp_mtl = os.path.splitext((os.path.basename(filepath)))[0] + '.mtl'
- if os.path.exists(DIR + temp_mtl) and temp_mtl not in material_libs:
-# if sys.exists(DIR + temp_mtl) and temp_mtl not in material_libs:
+ if os.path.exists(os.path.join(DIR, temp_mtl)) and temp_mtl not in material_libs:
material_libs.append( temp_mtl )
del temp_mtl
@@ -435,11 +434,9 @@
unique_material_images[None]= None, False
for libname in material_libs:
- mtlpath= DIR + libname
+ mtlpath= os.path.join(DIR, libname)
if not os.path.exists(mtlpath):
-# if not sys.exists(mtlpath):
- #print '\tError Missing MTL: "%s"' % mtlpath
- pass
+ print ("\tError Missing MTL: '%s'" % mtlpath)
else:
#print '\t\tloading mtl: "%s"' % mtlpath
context_material= None
Modified: branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/io/netrender/__init__.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -42,6 +42,9 @@
def unregister():
import bpy
+
+ bpy.types.Scene.RemoveProperty("network_render")
+
bpy.types.unregister(ui.NetRenderJob)
bpy.types.unregister(ui.NetRenderSettings)
bpy.types.unregister(ui.NetRenderSlave)
Modified: branches/soc-2010-nexyon/release/scripts/op/object.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/op/object.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/op/object.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -113,46 +113,48 @@
return context.object
def execute(self, context):
- objs = context.selected_objects
+ select_new = []
+ act_new = None
+
+
+ selected_objects = context.selected_objects
obj_act = context.object
- if context.object not in objs:
- objs.append(context.object)
+ if context.object not in selected_objects:
+ selected_objects.append(context.object)
- if not self.properties.extend:
- # for obj in objs:
- # obj.select = False
- bpy.ops.object.select_all(action='DESELECT')
-
if self.properties.direction == 'PARENT':
- parents = []
- for obj in objs:
+ for obj in selected_objects:
parent = obj.parent
if parent:
- parents.append(parent)
-
if obj_act == obj:
- context.scene.objects.active = parent
+ act_new = parent
- parent.select = True
-
- if parents:
- return {'CANCELLED'}
+ select_new.append(parent)
else:
- children = []
- for obj in objs:
- children += list(obj.children)
- for obj_iter in children:
- obj_iter.select = True
+ for obj in selected_objects:
+ select_new.extend(obj.children)
- children.sort(key=lambda obj_iter: obj_iter.name)
- context.scene.objects.active = children[0]
+ if select_new:
+ select_new.sort(key=lambda obj_iter: obj_iter.name)
+ act_new = select_new[0]
- return {'FINISHED'}
+ # dont edit any object settings above this
+ if select_new:
+ if not self.properties.extend:
+ bpy.ops.object.select_all(action='DESELECT')
+ for obj in select_new:
+ obj.select = True
+ context.scene.objects.active = act_new
+ return {'FINISHED'}
+
+ return {'CANCELLED'}
+
+
class SubdivisionSet(bpy.types.Operator):
'''Sets a Subdivision Surface Level (1-5)'''
Modified: branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -360,6 +360,7 @@
def unregister():
+ bpy.types.Scene.RemoveProperty("pose_templates")
unregister = bpy.types.unregister
for cls in classes:
unregister(cls)
Modified: branches/soc-2010-nexyon/release/scripts/ui/space_image.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/ui/space_image.py 2010-07-25 12:57:03 UTC (rev 30717)
+++ branches/soc-2010-nexyon/release/scripts/ui/space_image.py 2010-07-25 13:12:58 UTC (rev 30718)
@@ -562,23 +562,11 @@
toolsettings = context.tool_settings.image_paint
brush = toolsettings.brush
- wide_ui = context.region.width > narrowui
col = layout.split().column()
row = col.row()
- row.template_list(toolsettings, "brushes", toolsettings, "active_brush_index", rows=2)
+ col.template_ID_preview(toolsettings, "brush", new="brush.add", filter="is_imapaint_brush", rows=3, cols=8)
- col.template_ID(toolsettings, "brush", new="brush.add")
-
- if wide_ui:
- sub = layout.row(align=True)
- else:
- sub = layout.column(align=True)
- sub.prop_enum(brush, "imagepaint_tool", 'DRAW')
- sub.prop_enum(brush, "imagepaint_tool", 'SOFTEN')
- sub.prop_enum(brush, "imagepaint_tool", 'CLONE')
- sub.prop_enum(brush, "imagepaint_tool", 'SMEAR')
-
if brush:
col = layout.column()
col.template_color_wheel(brush, "color", value_slider=True)
@@ -604,6 +592,30 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list