[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24992] branches/bmesh/blender/release/ scripts: this someone didn't get committed
Joseph Eagar
joeedh at gmail.com
Sun Nov 29 01:45:41 CET 2009
Revision: 24992
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24992
Author: joeedh
Date: 2009-11-29 01:45:40 +0100 (Sun, 29 Nov 2009)
Log Message:
-----------
this someone didn't get committed
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/io/engine_render_pov.py
branches/bmesh/blender/release/scripts/io/export_3ds.py
branches/bmesh/blender/release/scripts/io/export_fbx.py
branches/bmesh/blender/release/scripts/io/export_mdd.py
branches/bmesh/blender/release/scripts/io/export_obj.py
branches/bmesh/blender/release/scripts/io/export_ply.py
branches/bmesh/blender/release/scripts/io/export_x3d.py
branches/bmesh/blender/release/scripts/io/import_anim_bvh.py
branches/bmesh/blender/release/scripts/io/import_scene_3ds.py
branches/bmesh/blender/release/scripts/io/import_scene_obj.py
branches/bmesh/blender/release/scripts/io/netrender/__init__.py
branches/bmesh/blender/release/scripts/io/netrender/client.py
branches/bmesh/blender/release/scripts/io/netrender/operators.py
branches/bmesh/blender/release/scripts/io/netrender/slave.py
branches/bmesh/blender/release/scripts/io/netrender/ui.py
branches/bmesh/blender/release/scripts/io/netrender/utils.py
branches/bmesh/blender/release/scripts/modules/bpy_types.py
branches/bmesh/blender/release/scripts/modules/dynamic_menu.py
branches/bmesh/blender/release/scripts/op/add_mesh_torus.py
branches/bmesh/blender/release/scripts/op/mesh.py
branches/bmesh/blender/release/scripts/op/mesh_skin.py
branches/bmesh/blender/release/scripts/op/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/op/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/op/wm.py
branches/bmesh/blender/release/scripts/templates/gamelogic.py
branches/bmesh/blender/release/scripts/templates/gamelogic_basic.py
branches/bmesh/blender/release/scripts/templates/gamelogic_module.py
branches/bmesh/blender/release/scripts/templates/operator.py
branches/bmesh/blender/release/scripts/templates/operator_simple.py
branches/bmesh/blender/release/scripts/ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/ui/properties_game.py
branches/bmesh/blender/release/scripts/ui/properties_material.py
branches/bmesh/blender/release/scripts/ui/properties_object.py
branches/bmesh/blender/release/scripts/ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/ui/properties_particle.py
branches/bmesh/blender/release/scripts/ui/properties_physics_cloth.py
branches/bmesh/blender/release/scripts/ui/properties_physics_common.py
branches/bmesh/blender/release/scripts/ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/ui/properties_physics_softbody.py
branches/bmesh/blender/release/scripts/ui/properties_render.py
branches/bmesh/blender/release/scripts/ui/properties_scene.py
branches/bmesh/blender/release/scripts/ui/properties_texture.py
branches/bmesh/blender/release/scripts/ui/properties_world.py
branches/bmesh/blender/release/scripts/ui/space_buttons.py
branches/bmesh/blender/release/scripts/ui/space_console.py
branches/bmesh/blender/release/scripts/ui/space_filebrowser.py
branches/bmesh/blender/release/scripts/ui/space_image.py
branches/bmesh/blender/release/scripts/ui/space_info.py
branches/bmesh/blender/release/scripts/ui/space_logic.py
branches/bmesh/blender/release/scripts/ui/space_node.py
branches/bmesh/blender/release/scripts/ui/space_outliner.py
branches/bmesh/blender/release/scripts/ui/space_sequencer.py
branches/bmesh/blender/release/scripts/ui/space_text.py
branches/bmesh/blender/release/scripts/ui/space_time.py
branches/bmesh/blender/release/scripts/ui/space_userpref.py
branches/bmesh/blender/release/scripts/ui/space_view3d.py
branches/bmesh/blender/release/scripts/ui/space_view3d_toolbar.py
Added Paths:
-----------
branches/bmesh/blender/release/scripts/modules/bpy/
branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
branches/bmesh/blender/release/scripts/modules/bpy/ops.py
branches/bmesh/blender/release/scripts/modules/bpy/utils.py
branches/bmesh/blender/release/scripts/modules/rna_prop_ui.py
branches/bmesh/blender/release/scripts/op/presets.py
branches/bmesh/blender/release/scripts/presets/
branches/bmesh/blender/release/scripts/presets/cloth/
branches/bmesh/blender/release/scripts/presets/cloth/cotton.py
branches/bmesh/blender/release/scripts/presets/cloth/denim.py
branches/bmesh/blender/release/scripts/presets/cloth/leather.py
branches/bmesh/blender/release/scripts/presets/cloth/rubber.py
branches/bmesh/blender/release/scripts/presets/cloth/silk.py
branches/bmesh/blender/release/scripts/presets/render/
branches/bmesh/blender/release/scripts/presets/render/HDTV_1080p.py
branches/bmesh/blender/release/scripts/presets/render/HDTV_720p.py
branches/bmesh/blender/release/scripts/presets/render/TV_NTSC.py
branches/bmesh/blender/release/scripts/presets/render/TV_PAL.py
branches/bmesh/blender/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/bmesh/blender/release/scripts/presets/sss/
branches/bmesh/blender/release/scripts/presets/sss/Apple.py
branches/bmesh/blender/release/scripts/presets/sss/Chicken.py
branches/bmesh/blender/release/scripts/presets/sss/Cream.py
branches/bmesh/blender/release/scripts/presets/sss/Ketchup.py
branches/bmesh/blender/release/scripts/presets/sss/Marble.py
branches/bmesh/blender/release/scripts/presets/sss/Potato.py
branches/bmesh/blender/release/scripts/presets/sss/Skim_Milk.py
branches/bmesh/blender/release/scripts/presets/sss/Skin1.py
branches/bmesh/blender/release/scripts/presets/sss/Skin2.py
branches/bmesh/blender/release/scripts/presets/sss/Whole_Milk.py
Removed Paths:
-------------
branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
branches/bmesh/blender/release/scripts/modules/bpy/ops.py
branches/bmesh/blender/release/scripts/modules/bpy/utils.py
branches/bmesh/blender/release/scripts/modules/bpy_ext/
branches/bmesh/blender/release/scripts/modules/bpy_utils.py
branches/bmesh/blender/release/scripts/presets/cloth/
branches/bmesh/blender/release/scripts/presets/cloth/cotton.py
branches/bmesh/blender/release/scripts/presets/cloth/denim.py
branches/bmesh/blender/release/scripts/presets/cloth/leather.py
branches/bmesh/blender/release/scripts/presets/cloth/rubber.py
branches/bmesh/blender/release/scripts/presets/cloth/silk.py
branches/bmesh/blender/release/scripts/presets/render/
branches/bmesh/blender/release/scripts/presets/render/HDTV_1080p.py
branches/bmesh/blender/release/scripts/presets/render/HDTV_720p.py
branches/bmesh/blender/release/scripts/presets/render/TV_NTSC.py
branches/bmesh/blender/release/scripts/presets/render/TV_PAL.py
branches/bmesh/blender/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/bmesh/blender/release/scripts/presets/sss/
branches/bmesh/blender/release/scripts/presets/sss/Apple.py
branches/bmesh/blender/release/scripts/presets/sss/Chicken.py
branches/bmesh/blender/release/scripts/presets/sss/Cream.py
branches/bmesh/blender/release/scripts/presets/sss/Ketchup.py
branches/bmesh/blender/release/scripts/presets/sss/Marble.py
branches/bmesh/blender/release/scripts/presets/sss/Potato.py
branches/bmesh/blender/release/scripts/presets/sss/Skim_Milk.py
branches/bmesh/blender/release/scripts/presets/sss/Skin1.py
branches/bmesh/blender/release/scripts/presets/sss/Skin2.py
branches/bmesh/blender/release/scripts/presets/sss/Whole_Milk.py
branches/bmesh/blender/release/scripts/ui/properties_data_text.py
Modified: branches/bmesh/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/bmesh/blender/release/scripts/io/engine_render_pov.py 2009-11-29 00:13:34 UTC (rev 24991)
+++ branches/bmesh/blender/release/scripts/io/engine_render_pov.py 2009-11-29 00:45:40 UTC (rev 24992)
@@ -285,7 +285,7 @@
for ob in sel:
ob_num+= 1
- if ob.type in ('LAMP', 'CAMERA', 'EMPTY', 'META'):
+ if ob.type in ('LAMP', 'CAMERA', 'EMPTY', 'META', 'ARMATURE'):
continue
me = ob.data
@@ -722,26 +722,26 @@
def _export(self, scene):
import tempfile
- self.temp_file_in = tempfile.mktemp(suffix='.pov')
- self.temp_file_out = tempfile.mktemp(suffix='.tga')
- self.temp_file_ini = tempfile.mktemp(suffix='.ini')
+ self._temp_file_in = tempfile.mktemp(suffix='.pov')
+ self._temp_file_out = tempfile.mktemp(suffix='.tga')
+ self._temp_file_ini = tempfile.mktemp(suffix='.ini')
'''
- self.temp_file_in = '/test.pov'
- self.temp_file_out = '/test.tga'
- self.temp_file_ini = '/test.ini'
+ self._temp_file_in = '/test.pov'
+ self._temp_file_out = '/test.tga'
+ self._temp_file_ini = '/test.ini'
'''
def info_callback(txt):
self.update_stats("", "POVRAY: " + txt)
- write_pov(self.temp_file_in, scene, info_callback)
+ write_pov(self._temp_file_in, scene, info_callback)
def _render(self):
- try: os.remove(self.temp_file_out) # so as not to load the old file
+ try: os.remove(self._temp_file_out) # so as not to load the old file
except: pass
- write_pov_ini(self.temp_file_ini, self.temp_file_in, self.temp_file_out)
+ write_pov_ini(self._temp_file_ini, self._temp_file_in, self._temp_file_out)
print ("***-STARTING-***")
@@ -757,15 +757,15 @@
pov_binary = winreg.QueryValueEx(regKey, 'Home')[0] + '\\bin\\pvengine'
if 1:
- self.process = subprocess.Popen([pov_binary, self.temp_file_ini]) # stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ self._process = subprocess.Popen([pov_binary, self._temp_file_ini]) # stdout=subprocess.PIPE, stderr=subprocess.PIPE
else:
# This works too but means we have to wait until its done
- os.system('%s %s' % (pov_binary, self.temp_file_ini))
+ os.system('%s %s' % (pov_binary, self._temp_file_ini))
print ("***-DONE-***")
def _cleanup(self):
- for f in (self.temp_file_in, self.temp_file_ini, self.temp_file_out):
+ for f in (self._temp_file_in, self._temp_file_ini, self._temp_file_out):
try: os.remove(f)
except: pass
@@ -785,19 +785,19 @@
y= int(r.resolution_y*r.resolution_percentage*0.01)
# Wait for the file to be created
- while not os.path.exists(self.temp_file_out):
+ while not os.path.exists(self._temp_file_out):
if self.test_break():
- try: self.process.terminate()
+ try: self._process.terminate()
except: pass
break
- if self.process.poll() != None:
+ if self._process.poll() != None:
self.update_stats("", "POVRAY: Failed")
break
time.sleep(self.DELAY)
- if os.path.exists(self.temp_file_out):
+ if os.path.exists(self._temp_file_out):
self.update_stats("", "POVRAY: Rendering")
@@ -807,7 +807,7 @@
result = self.begin_result(0, 0, x, y)
lay = result.layers[0]
# possible the image wont load early on.
- try: lay.load_from_file(self.temp_file_out)
+ try: lay.load_from_file(self._temp_file_out)
except: pass
self.end_result(result)
@@ -815,23 +815,23 @@
while True:
# test if povray exists
- if self.process.poll() != None:
+ if self._process.poll() != None:
update_image();
break
# user exit
if self.test_break():
- try: self.process.terminate()
+ try: self._process.terminate()
except: pass
break
# Would be nice to redirect the output
- # stdout_value, stderr_value = self.process.communicate() # locks
+ # stdout_value, stderr_value = self._process.communicate() # locks
# check if the file updated
- new_size = os.path.getsize(self.temp_file_out)
+ new_size = os.path.getsize(self._temp_file_out)
if new_size != prev_size:
update_image()
@@ -884,7 +884,7 @@
def draw_header(self, context):
scene = context.scene
- self.layout.itemR(scene, "pov_radio_enable", text="")
+ self.layout.prop(scene, "pov_radio_enable", text="")
def draw(self, context):
layout = self.layout
@@ -897,34 +897,34 @@
split = layout.split()
col = split.column()
- col.itemR(scene, "pov_radio_count", text="Rays")
- col.itemR(scene, "pov_radio_recursion_limit", text="Recursions")
+ col.prop(scene, "pov_radio_count", text="Rays")
+ col.prop(scene, "pov_radio_recursion_limit", text="Recursions")
col = split.column()
- col.itemR(scene, "pov_radio_error_bound", text="Error")
+ col.prop(scene, "pov_radio_error_bound", text="Error")
- layout.itemR(scene, "pov_radio_display_advanced")
+ layout.prop(scene, "pov_radio_display_advanced")
if scene.pov_radio_display_advanced:
split = layout.split()
col = split.column()
- col.itemR(scene, "pov_radio_adc_bailout", slider=True)
- col.itemR(scene, "pov_radio_gray_threshold", slider=True)
- col.itemR(scene, "pov_radio_low_error_factor", slider=True)
+ col.prop(scene, "pov_radio_adc_bailout", slider=True)
+ col.prop(scene, "pov_radio_gray_threshold", slider=True)
+ col.prop(scene, "pov_radio_low_error_factor", slider=True)
col = split.column()
- col.itemR(scene, "pov_radio_brightness")
- col.itemR(scene, "pov_radio_minimum_reuse", text="Min Reuse")
- col.itemR(scene, "pov_radio_nearest_count")
+ col.prop(scene, "pov_radio_brightness")
+ col.prop(scene, "pov_radio_minimum_reuse", text="Min Reuse")
+ col.prop(scene, "pov_radio_nearest_count")
split = layout.split()
col = split.column()
- col.itemL(text="Estimation Influence:")
- col.itemR(scene, "pov_radio_media")
- col.itemR(scene, "pov_radio_normal")
+ col.label(text="Estimation Influence:")
+ col.prop(scene, "pov_radio_media")
+ col.prop(scene, "pov_radio_normal")
col = split.column()
- col.itemR(scene, "pov_radio_always_sample")
+ col.prop(scene, "pov_radio_always_sample")
bpy.types.register(RENDER_PT_povray_radiosity)
Modified: branches/bmesh/blender/release/scripts/io/export_3ds.py
===================================================================
--- branches/bmesh/blender/release/scripts/io/export_3ds.py 2009-11-29 00:13:34 UTC (rev 24991)
+++ branches/bmesh/blender/release/scripts/io/export_3ds.py 2009-11-29 00:45:40 UTC (rev 24992)
@@ -1123,7 +1123,7 @@
def execute(self, context):
- save_3ds(self.path, context)
+ save_3ds(self.properties.path, context)
return ('FINISHED',)
def invoke(self, context, event):
@@ -1132,7 +1132,6 @@
return ('RUNNING_MODAL',)
def poll(self, context): # Poll isnt working yet
- print("Poll")
return context.active_object != None
bpy.ops.add(Export3DS)
@@ -1142,6 +1141,6 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".3ds")
- self.layout.item_stringO(Export3DS.bl_idname, "path", default_path, text="Autodesk 3DS...")
+ self.layout.operator(Export3DS.bl_idname, text="Autodesk 3DS...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
Modified: branches/bmesh/blender/release/scripts/io/export_fbx.py
===================================================================
--- branches/bmesh/blender/release/scripts/io/export_fbx.py 2009-11-29 00:13:34 UTC (rev 24991)
+++ branches/bmesh/blender/release/scripts/io/export_fbx.py 2009-11-29 00:45:40 UTC (rev 24992)
@@ -498,8 +498,7 @@
# not public
pose = fbxArm.blenObject.pose
# pose = fbxArm.blenObject.getPose()
- self.__pose_bone = pose.pose_channels[self.blenName]
-# self.__pose_bone = pose.bones[self.blenName]
+ self.__pose_bone = pose.bones[self.blenName]
# store a list if matricies here, (poseMatrix, head, tail)
# {frame:posematrix, frame:posematrix, ...}
@@ -3394,36 +3393,36 @@
return context.active_object != None
def execute(self, context):
- if not self.path:
+ if not self.properties.path:
raise Exception("path not set")
GLOBAL_MATRIX = mtx4_identity
- GLOBAL_MATRIX[0][0] = GLOBAL_MATRIX[1][1] = GLOBAL_MATRIX[2][2] = self._SCALE
- if self._XROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_x90n
- if self._YROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_y90n
- if self._ZROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_z90n
+ GLOBAL_MATRIX[0][0] = GLOBAL_MATRIX[1][1] = GLOBAL_MATRIX[2][2] = self.properties._SCALE
+ if self.properties._XROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_x90n
+ if self.properties._YROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_y90n
+ if self.properties._ZROT90: GLOBAL_MATRIX = GLOBAL_MATRIX * mtx4_z90n
- write(self.path,
+ write(self.properties.path,
None, # XXX
context,
- self.EXP_OBS_SELECTED,
- self.EXP_MESH,
- self.EXP_MESH_APPLY_MOD,
-# self.EXP_MESH_HQ_NORMALS,
- self.EXP_ARMATURE,
- self.EXP_LAMP,
- self.EXP_CAMERA,
- self.EXP_EMPTY,
- self.EXP_IMAGE_COPY,
+ self.properties.EXP_OBS_SELECTED,
+ self.properties.EXP_MESH,
+ self.properties.EXP_MESH_APPLY_MOD,
+# self.properties.EXP_MESH_HQ_NORMALS,
+ self.properties.EXP_ARMATURE,
+ self.properties.EXP_LAMP,
+ self.properties.EXP_CAMERA,
+ self.properties.EXP_EMPTY,
+ self.properties.EXP_IMAGE_COPY,
GLOBAL_MATRIX,
- self.ANIM_ENABLE,
- self.ANIM_OPTIMIZE,
- self.ANIM_OPTIMIZE_PRECISSION,
- self.ANIM_ACTION_ALL,
- self.BATCH_ENABLE,
- self.BATCH_GROUP,
- self.BATCH_FILE_PREFIX,
- self.BATCH_OWN_DIR)
+ self.properties.ANIM_ENABLE,
+ self.properties.ANIM_OPTIMIZE,
+ self.properties.ANIM_OPTIMIZE_PRECISSION,
+ self.properties.ANIM_ACTION_ALL,
+ self.properties.BATCH_ENABLE,
+ self.properties.BATCH_GROUP,
+ self.properties.BATCH_FILE_PREFIX,
+ self.properties.BATCH_OWN_DIR)
return ('FINISHED',)
@@ -3467,7 +3466,7 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".fbx")
- self.layout.item_stringO(ExportFBX.bl_idname, "path", default_path, text="Autodesk FBX...")
+ self.layout.operator(ExportFBX.bl_idname, text="Autodesk FBX...").path = default_path
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list