[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28043] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27962 :28042
Brecht Van Lommel
brecht at blender.org
Tue Apr 6 11:29:51 CEST 2010
Revision: 28043
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28043
Author: blendix
Date: 2010-04-06 11:29:50 +0200 (Tue, 06 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27962:28042
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/config/darwin-config.py
branches/render25/release/scripts/io/engine_render_pov.py
branches/render25/release/scripts/io/export_3ds.py
branches/render25/release/scripts/io/export_fbx.py
branches/render25/release/scripts/io/export_mdd.py
branches/render25/release/scripts/io/export_obj.py
branches/render25/release/scripts/io/export_ply.py
branches/render25/release/scripts/io/export_x3d.py
branches/render25/release/scripts/io/import_scene_obj.py
branches/render25/release/scripts/io/import_shape_mdd.py
branches/render25/release/scripts/keyingsets/keyingsets_utils.py
branches/render25/release/scripts/modules/rigify/__init__.py
branches/render25/release/scripts/modules/rigify/arm_biped.py
branches/render25/release/scripts/modules/rigify/eye_balls.py
branches/render25/release/scripts/modules/rigify/eye_lid.py
branches/render25/release/scripts/modules/rigify/finger_curl.py
branches/render25/release/scripts/modules/rigify/leg_biped.py
branches/render25/release/scripts/modules/rigify/leg_quadruped.py
branches/render25/release/scripts/modules/rigify/mouth.py
branches/render25/release/scripts/modules/rigify/neck_flex.py
branches/render25/release/scripts/modules/rigify/palm_curl.py
branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/render25/release/scripts/modules/rigify/stretch.py
branches/render25/release/scripts/modules/rigify/tail_control.py
branches/render25/release/scripts/modules/rigify_utils.py
branches/render25/release/scripts/op/image.py
branches/render25/release/scripts/op/nla.py
branches/render25/release/scripts/op/screen_play_rendered_anim.py
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/properties_object.py
branches/render25/release/scripts/ui/properties_particle.py
branches/render25/release/scripts/ui/properties_physics_cloth.py
branches/render25/release/scripts/ui/properties_physics_fluid.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/space_dopesheet.py
branches/render25/release/scripts/ui/space_graph.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/release/scripts/ui/space_view3d_toolbar.py
branches/render25/source/blender/blenfont/intern/blf_font.c
branches/render25/source/blender/blenkernel/BKE_colortools.h
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/mesh.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenkernel/intern/unit.c
branches/render25/source/blender/blenlib/BLI_bfile.h
branches/render25/source/blender/blenlib/intern/BLI_bfile.c
branches/render25/source/blender/blenlib/intern/math_color.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/collada/DocumentImporter.cpp
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/datafiles/B.blend.c
branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
branches/render25/source/blender/editors/gpencil/gpencil_paint.c
branches/render25/source/blender/editors/include/ED_keyframes_edit.h
branches/render25/source/blender/editors/include/ED_transform.h
branches/render25/source/blender/editors/include/UI_interface.h
branches/render25/source/blender/editors/include/UI_resources.h
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_intern.h
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_loop.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/mesh/mesh_intern.h
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/space_action/action_intern.h
branches/render25/source/blender/editors/space_action/action_ops.c
branches/render25/source/blender/editors/space_action/action_select.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_console/space_console.c
branches/render25/source/blender/editors/space_file/fsmenu.c
branches/render25/source/blender/editors/space_graph/graph_intern.h
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_graph/graph_select.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_intern.h
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_info/space_info.c
branches/render25/source/blender/editors/space_logic/space_logic.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_nla/space_nla.c
branches/render25/source/blender/editors/space_node/node_draw.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_intern.h
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_outliner/space_outliner.c
branches/render25/source/blender/editors/space_script/space_script.c
branches/render25/source/blender/editors/space_sound/space_sound.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_ops.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform.h
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_manipulator.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/gpu/GPU_extensions.h
branches/render25/source/blender/gpu/intern/gpu_extensions.c
branches/render25/source/blender/makesdna/DNA_color_types.h
branches/render25/source/blender/makesdna/DNA_customdata_types.h
branches/render25/source/blender/makesdna/DNA_modifier_types.h
branches/render25/source/blender/makesdna/DNA_particle_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesdna/DNA_userdef_types.h
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/makesrna/intern/rna_animation_api.c
branches/render25/source/blender/makesrna/intern/rna_armature.c
branches/render25/source/blender/makesrna/intern/rna_color.c
branches/render25/source/blender/makesrna/intern/rna_constraint.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_key.c
branches/render25/source/blender/makesrna/intern/rna_main.c
branches/render25/source/blender/makesrna/intern/rna_material.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_nodetree.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_object_api.c
branches/render25/source/blender/makesrna/intern/rna_object_force.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
branches/render25/source/blender/makesrna/intern/rna_pose.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_scene_api.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/blender/makesrna/intern/rna_wm.c
branches/render25/source/blender/makesrna/intern/rna_wm_api.c
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/generic/blf.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/wm_event_types.h
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/CMakeLists.txt 2010-04-06 09:29:50 UTC (rev 28043)
@@ -460,8 +460,8 @@
IF(WITH_SNDFILE)
SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
- SET(SNDFILE_LIB sndfile)
- SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+ SET(SNDFILE_LIB sndfile FLAC ogg vorbis vorbisenc)
+ SET(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)
ENDIF(WITH_SNDFILE)
SET(PYTHON_VERSION 3.1)
Modified: branches/render25/config/darwin-config.py
===================================================================
--- branches/render25/config/darwin-config.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/config/darwin-config.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -131,8 +131,8 @@
WITH_BF_SNDFILE = True
BF_SNDFILE = LIBDIR + '/sndfile'
BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+BF_SNDFILE_LIB = 'sndfile FLAC ogg vorbis vorbisenc'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored in ffmpeg dir
WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
Modified: branches/render25/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/render25/release/scripts/io/engine_render_pov.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/release/scripts/io/engine_render_pov.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -267,7 +267,7 @@
file.write('}\n')
- def exportMeshs(sel):
+ def exportMeshs(scene, sel):
ob_num = 0
@@ -280,7 +280,7 @@
me = ob.data
me_materials = me.materials
- me = ob.create_mesh(True, 'RENDER')
+ me = ob.create_mesh(scene, True, 'RENDER')
if not me:
continue
@@ -593,7 +593,7 @@
sel = scene.objects
exportLamps([l for l in sel if l.type == 'LAMP'])
exportMeta([l for l in sel if l.type == 'META'])
- exportMeshs(sel)
+ exportMeshs(scene, sel)
exportWorld(scene.world)
exportGlobalSettings(scene)
Modified: branches/render25/release/scripts/io/export_3ds.py
===================================================================
--- branches/render25/release/scripts/io/export_3ds.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/release/scripts/io/export_3ds.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -74,12 +74,12 @@
# also used by X3D exporter
# return a tuple (free, object list), free is True if memory should be freed later with free_derived_objects()
-def create_derived_objects(ob):
+def create_derived_objects(scene, ob):
if ob.parent and ob.parent.dupli_type != 'NONE':
return False, None
if ob.dupli_type != 'NONE':
- ob.create_dupli_list()
+ ob.create_dupli_list(scene)
return True, [(dob.object, dob.matrix) for dob in ob.dupli_list]
else:
return False, [(ob, ob.matrix)]
@@ -942,6 +942,8 @@
sce = context.scene
# sce= bpy.data.scenes.active
+ bpy.ops.object.mode_set(mode='OBJECT')
+
# Initialize the main chunk (primary):
primary = _3ds_chunk(PRIMARY)
# Add version chunk:
@@ -966,11 +968,12 @@
# each material is added once):
materialDict = {}
mesh_objects = []
- for ob in [ob for ob in context.scene.objects if ob.is_visible()]:
+ scene = context.scene
+ for ob in [ob for ob in scene.objects if ob.is_visible(scene)]:
# for ob in sce.objects.context:
# get derived objects
- free, derived = create_derived_objects(ob)
+ free, derived = create_derived_objects(scene, ob)
if derived == None: continue
@@ -980,7 +983,7 @@
if ob.type not in ('MESH', 'CURVE', 'SURFACE', 'TEXT', 'META'):
continue
- data = ob_derived.create_mesh(True, 'PREVIEW')
+ data = ob_derived.create_mesh(scene, True, 'PREVIEW')
# data = getMeshFromObject(ob_derived, None, True, False, sce)
if data:
data.transform(mat)
Modified: branches/render25/release/scripts/io/export_fbx.py
===================================================================
--- branches/render25/release/scripts/io/export_fbx.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/release/scripts/io/export_fbx.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -344,6 +344,8 @@
BATCH_OWN_DIR = False
):
+ bpy.ops.object.mode_set(mode='OBJECT')
+
# ----------------- Batch support!
if BATCH_ENABLE:
if os == None: BATCH_OWN_DIR = False
@@ -388,7 +390,6 @@
orig_sce = context.scene
# orig_sce = bpy.data.scenes.active
-
new_fbxpath = fbxpath # own dir option modifies, we need to keep an original
for data in data_seq: # scene or group
newname = BATCH_FILE_PREFIX + bpy.utils.clean_name(data.name)
@@ -651,7 +652,7 @@
}''' % (curtime))
file.write('\nCreationTime: "%.4i-%.2i-%.2i %.2i:%.2i:%.2i:000"' % curtime)
- file.write('\nCreator: "Blender3D version %s"' % bpy.app.version_string)
+ file.write('\nCreator: "Blender version %s"' % bpy.app.version_string)
pose_items = [] # list of (fbxName, matrix) to write pose data for, easier to collect allong the way
@@ -2037,7 +2038,7 @@
if ob_arms_orig_rest:
for ob_base in bpy.data.objects:
#if ob_base.type == 'Armature':
- ob_base.make_display_list()
+ ob_base.make_display_list(scene)
# ob_base.makeDisplayList()
# This causes the makeDisplayList command to effect the mesh
@@ -2053,7 +2054,7 @@
obs = [(ob_base, ob_base.matrix)]
if ob_base.dupli_type != 'NONE':
- ob_base.create_dupli_list()
+ ob_base.create_dupli_list(scene)
obs = [(dob.object, dob.matrix) for dob in ob_base.dupli_list]
for ob, mtx in obs:
@@ -2082,7 +2083,7 @@
if tmp_ob_type != 'MESH':
# if tmp_ob_type != 'Mesh':
# me = bpy.data.meshes.new()
- try: me = ob.create_mesh(True, 'PREVIEW')
+ try: me = ob.create_mesh(scene, True, 'PREVIEW')
# try: me.getFromObject(ob)
except: me = None
if me:
@@ -2093,7 +2094,7 @@
# Mesh Type!
if EXP_MESH_APPLY_MOD:
# me = bpy.data.meshes.new()
- me = ob.create_mesh(True, 'PREVIEW')
+ me = ob.create_mesh(scene, True, 'PREVIEW')
# me.getFromObject(ob)
# so we keep the vert groups
@@ -2213,7 +2214,7 @@
for ob_base in bpy.data.objects:
if ob_base.type == 'ARMATURE':
# if ob_base.type == 'Armature':
- ob_base.make_display_list()
+ ob_base.make_display_list(scene)
# ob_base.makeDisplayList()
# This causes the makeDisplayList command to effect the mesh
scene.set_frame(scene.frame_current)
Modified: branches/render25/release/scripts/io/export_mdd.py
===================================================================
--- branches/render25/release/scripts/io/export_mdd.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/release/scripts/io/export_mdd.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -84,7 +84,7 @@
orig_frame = sce.frame_current
sce.set_frame(PREF_STARTFRAME)
- me = ob.create_mesh(True, 'PREVIEW')
+ me = ob.create_mesh(sce, True, 'PREVIEW')
#Flip y and z
mat_flip = Mathutils.Matrix(\
@@ -123,7 +123,7 @@
"""
sce.set_frame(frame)
- me = ob.create_mesh(True, 'PREVIEW')
+ me = ob.create_mesh(sce, True, 'PREVIEW')
check_vertcount(me, numverts)
me.transform(mat_flip * ob.matrix)
Modified: branches/render25/release/scripts/io/export_obj.py
===================================================================
--- branches/render25/release/scripts/io/export_obj.py 2010-04-06 09:11:33 UTC (rev 28042)
+++ branches/render25/release/scripts/io/export_obj.py 2010-04-06 09:29:50 UTC (rev 28043)
@@ -88,7 +88,7 @@
file = open(filename, "w")
# XXX
-# file.write('# Blender3D MTL File: %s\n' % Blender.Get('filename').split('\\')[-1].split('/')[-1])
+# file.write('# Blender MTL File: %s\n' % Blender.Get('filename').split('\\')[-1].split('/')[-1])
file.write('# Material Count: %i\n' % len(mtl_dict))
# Write material/image combinations we have used.
for key, (mtl_mat_name, mat, img) in mtl_dict.items():
@@ -361,8 +361,8 @@
file = open(filename, "w")
# Write Header
- file.write('# Blender3D v%s OBJ File: %s\n' % (bpy.app.version_string, bpy.data.filename.split('/')[-1].split('\\')[-1] ))
- file.write('# www.blender3d.org\n')
+ file.write('# Blender v%s OBJ File: %s\n' % (bpy.app.version_string, bpy.data.filename.split('/')[-1].split('\\')[-1] ))
+ file.write('# www.blender.org\n')
# Tell the obj file what material file to use.
if EXPORT_MTL:
@@ -396,7 +396,7 @@
if ob_main.dupli_type != 'NONE':
# XXX
print('creating dupli_list on', ob_main.name)
- ob_main.create_dupli_list()
+ ob_main.create_dupli_list(scene)
obs = [(dob.object, dob.matrix) for dob in ob_main.dupli_list]
@@ -421,7 +421,7 @@
if ob.type != 'MESH':
continue
- me = ob.create_mesh(EXPORT_APPLY_MODIFIERS, 'PREVIEW')
+ me = ob.create_mesh(scene, EXPORT_APPLY_MODIFIERS, 'PREVIEW')
if EXPORT_ROTX90:
me.transform(mat_xrot90 * ob_mat)
@@ -816,14 +816,15 @@
EXPORT_KEEP_VERT_ORDER = False,
EXPORT_POLYGROUPS = False,
EXPORT_CURVE_AS_NURBS = True):
- # Window.EditMode(0)
- # Window.WaitCursor(1)
-
+
base_name, ext = splitExt(filename)
context_name = [base_name, '', '', ext] # Base name, scene name, frame number, extension
orig_scene = context.scene
+ # Exit edit mode before exporting, so current object states are exported properly.
+ bpy.ops.object.mode_set(mode='OBJECT')
+
# if EXPORT_ALL_SCENES:
# export_scenes = bpy.data.scenes
# else:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list