[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2506] tags/2_60a_release/py/scripts/ addons: svn merge ^/trunk/py/scripts/addons -c2494, 2495, 2496, 2504
Campbell Barton
ideasman42 at gmail.com
Sun Oct 23 18:06:53 CEST 2011
Revision: 2506
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2506
Author: campbellbarton
Date: 2011-10-23 16:06:52 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/py/scripts/addons -c2494,2495,2496,2504
Modified Paths:
--------------
tags/2_60a_release/py/scripts/addons/io_coat3D/coat.py
tags/2_60a_release/py/scripts/addons/io_scene_map/export_map.py
Property Changed:
----------------
tags/2_60a_release/py/scripts/addons/
Property changes on: tags/2_60a_release/py/scripts/addons
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/py/scripts/addons:2494-2496,2502,2504
Modified: tags/2_60a_release/py/scripts/addons/io_coat3D/coat.py
===================================================================
--- tags/2_60a_release/py/scripts/addons/io_coat3D/coat.py 2011-10-23 15:40:38 UTC (rev 2505)
+++ tags/2_60a_release/py/scripts/addons/io_coat3D/coat.py 2011-10-23 16:06:52 UTC (rev 2506)
@@ -26,29 +26,17 @@
bpy.coat3D = dict()
bpy.coat3D['active_coat'] = ''
bpy.coat3D['status'] = 0
-
-def set_folders():
+def set_exchange_folder():
platform = os.sys.platform
coat3D = bpy.context.scene.coat3D
+ Blender_export = ""
if(platform == 'win32'):
- folder_objects = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Objects'
- folder_textures = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Textures' + os.sep
- if(not(os.path.isdir(folder_objects))):
- os.makedirs(folder_objects)
- if(not(os.path.isdir(folder_textures))):
- os.makedirs(folder_textures)
exchange = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3D-CoatV3' + os.sep +'Exchange'
-
else:
- folder_objects = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Objects'
- folder_textures = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Textures' + os.sep
- if(not(os.path.isdir(folder_objects))):
- os.makedirs(folder_objects)
- if(not(os.path.isdir(folder_textures))):
- os.makedirs(folder_textures)
- exchange = os.path.expanduser("~") + os.sep + '3D-CoatV3' + os.sep +'Exchange'
+ exchange = os.path.expanduser("~") + os.sep + '3D-CoatV3' + os.sep + 'Exchange'
+
if(os.path.isdir(exchange)):
- coat3D.exchange_found = True
+ bpy.coat3D['status'] = 1
else:
if(platform == 'win32'):
exchange_path = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Exchange_folder.txt'
@@ -65,14 +53,45 @@
if(os.path.isdir(ex_path) and ex_path.rfind('Exchange') >= 0):
exchange = ex_path
- coat3D.exchange_found = True
+ bpy.coat3D['status'] = 1
else:
- coat3D.exchange_found = False
+ bpy.coat3D['status'] = 0
else:
- coat3D.exchange_found = False
+ bpy.coat3D['status'] = 0
+ if(bpy.coat3D['status'] == 1):
+ Blender_folder = ("%s%sBlender"%(exchange,os.sep))
+ Blender_export = Blender_folder
+ path3b_now = exchange
+ path3b_now += ('last_saved_3b_file.txt')
+ Blender_export += ('%sexport.txt'%(os.sep))
+
+ if(not(os.path.isdir(Blender_folder))):
+ os.makedirs(Blender_folder)
+ Blender_folder = os.path.join(Blender_folder,"run.txt")
+ file = open(Blender_folder, "w")
+ file.close()
+ return exchange
+
+def set_working_folders():
+ platform = os.sys.platform
+ coat3D = bpy.context.scene.coat3D
+ if(platform == 'win32'):
+ folder_objects = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Objects'
+ folder_textures = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Textures' + os.sep
+ if(not(os.path.isdir(folder_objects))):
+ os.makedirs(folder_objects)
+ if(not(os.path.isdir(folder_textures))):
+ os.makedirs(folder_textures)
+ else:
+ folder_objects = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Objects'
+ folder_textures = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Textures' + os.sep
+ if(not(os.path.isdir(folder_objects))):
+ os.makedirs(folder_objects)
+ if(not(os.path.isdir(folder_textures))):
+ os.makedirs(folder_textures)
- return exchange,folder_objects,folder_textures
+ return folder_objects,folder_textures
class ObjectButtonsPanel():
bl_space_type = 'PROPERTIES'
@@ -93,42 +112,36 @@
import_no = 0
coat = bpy.coat3D
coat3D = bpy.context.scene.coat3D
- Blender_export = ""
if(bpy.context.scene.objects.active):
coa = bpy.context.scene.objects.active.coat3D
-
-
- Blender_folder = ("%s%sBlender"%(coat3D.exchangedir,os.sep))
- Blender_export = Blender_folder
- path3b_now = coat3D.exchangedir
- path3b_now += ('last_saved_3b_file.txt')
- Blender_export += ('%sexport.txt'%(os.sep))
- if(not(os.path.isdir(Blender_folder))):
- os.makedirs(Blender_folder)
- Blender_folder = os.path.join(Blender_folder,"run.txt")
- file = open(Blender_folder, "w")
- file.close()
-
- #Here you add your GUI
- row = layout.row()
- row.prop(coat3D,"type",text = "")
- row = layout.row()
- colL = row.column()
- colR = row.column()
-
- colR.operator("export_applink.pilgway_3d_coat", text="Transfer")
-
- colL.operator("import_applink.pilgway_3d_coat", text="Update")
-
- if(coat3D.exchange_found == False):
+
+ if(bpy.coat3D['status'] == 0 and not(os.path.isdir(coat3D.exchangedir))):
+ print('toivottavasti nyt toimii')
+ bpy.coat3D['active_coat'] = set_exchange_folder()
row = layout.row()
row.label(text="Applink didn't find your 3d-Coat/Excahnge folder.")
row = layout.row()
- row.label("Please select it and press Transfer button again")
+ row.label("Please select it before using Applink.")
row = layout.row()
- row.prop(coat3D,"exchangefolder",text="")
+ row.prop(coat3D,"exchangedir",text="")
+
+ else:
+
+
+ #Here you add your GUI
+ row = layout.row()
+ row.prop(coat3D,"type",text = "")
+ row = layout.row()
+ colL = row.column()
+ colR = row.column()
+
+ colR.operator("export_applink.pilgway_3d_coat", text="Transfer")
+
+ colL.operator("import_applink.pilgway_3d_coat", text="Update")
+
+
@@ -149,9 +162,10 @@
activeobj = bpy.context.active_object.name
obj = scene.objects[activeobj]
coa = bpy.context.scene.objects.active.coat3D
+ coat3D.exchangedir = set_exchange_folder()
export_ok = False
- coat3D.exchangedir,folder_objects,folder_textures = set_folders()
+ folder_objects,folder_textures = set_working_folders()
if(coat3D.exchange_found == False):
return {'FINISHED'}
@@ -209,16 +223,8 @@
obj.scale = coa.sca
bpy.context.scene.cursor_location = coat3D.cursor_loc
-
-
-
-
bpy.context.scene.cursor_location = coat3D.cursor_orginal
-
-
-
-
file = open(importfile, "w")
file.write("%s"%(checkname))
file.write("\n%s"%(checkname))
@@ -243,8 +249,9 @@
test = bpy.context.selected_objects
act_first = bpy.context.scene.objects.active
bpy.context.scene.game_settings.material_mode = 'GLSL'
+ coat3D.exchangedir = set_exchange_folder()
- coat3D.exchangedir,folder_objects,folder_textures = set_folders()
+ folder_objects,folder_textures = set_working_folders()
Blender_folder = ("%s%sBlender"%(coat3D.exchangedir,os.sep))
Blender_export = Blender_folder
@@ -253,7 +260,6 @@
Blender_export += ('%sexport.txt'%(os.sep))
new_applink_name = 'False'
new_object = False
- print(Blender_export)
if(os.path.isfile(Blender_export)):
obj_pathh = open(Blender_export)
new_object = True
@@ -270,7 +276,6 @@
for act_name in test:
coa = act_name.coat3D
path_object = coa.applink_name
- print(path_object)
if act_name.type == 'MESH' and os.path.isfile(path_object):
multires_on = False
activeobj = act_name.name
Modified: tags/2_60a_release/py/scripts/addons/io_scene_map/export_map.py
===================================================================
--- tags/2_60a_release/py/scripts/addons/io_scene_map/export_map.py 2011-10-23 15:40:38 UTC (rev 2505)
+++ tags/2_60a_release/py/scripts/addons/io_scene_map/export_map.py 2011-10-23 16:06:52 UTC (rev 2506)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8 compliant>
+# <pep8-80 compliant>
import bpy
import os
@@ -44,6 +44,14 @@
return None
+def face_material_get(face):
+ me = face.id_data
+ try:
+ return me.materials[f.material_index]
+ except:
+ return None
+
+
def write_cube2brush(file, faces):
'''
Takes 6 faces and writes a brush,
@@ -66,15 +74,18 @@
for v in f.vertices[:][2::-1]:
file.write(format_vec % me.vertices[v].co[:])
- uf = face_uv_get(f)
+ material = face_material_get(f)
- if uf and uf.hide:
+ if material and material.game_settings.invisible:
file.write(PREF_INVIS_TEX)
else:
+ uf = face_uv_get(f)
+
image = uf.image if uf else None
if image:
- file.write(os.path.splitext(bpy.path.basename(image.filepath))[0])
+ file.write(os.path.splitext(
+ bpy.path.basename(image.filepath))[0])
else:
file.write(PREF_NULL_TEX)
@@ -103,11 +114,13 @@
image_text = PREF_NULL_TEX
- uf = face_uv_get(face)
+ material = face_material_get(f)
- if uf and uf.hide:
+ if material and material.game_settings.invisible:
image_text = PREF_INVIS_TEX
else:
+ uf = face_uv_get(face)
+
image = uf.image if uf else None
if image:
@@ -269,13 +282,18 @@
def export_map(context, filepath):
"""
pup_block = [\
- ('Scale:', PREF_SCALE, 1, 1000, 'Scale the blender scene by this value.'),\
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list