Revision: 23840
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23840
Author: campbellbarton
Date: 2009-10-14 17:06:42 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
- added name field for renderlayer
- skin/loft now adds faces with active material
- defailt for scene panels isnt closed anymore since there is a lot of room
there now.
Modified Paths:
--------------
trunk/blender/release/scripts/io/mesh_skin.py
trunk/blender/release/scripts/ui/buttons_render.py
trunk/blender/release/scripts/ui/buttons_scene.py
Modified: trunk/blender/release/scripts/io/mesh_skin.py
===================================================================
--- trunk/blender/release/scripts/io/mesh_skin.py 2009-10-14 14:58:18 UTC
(rev 23839)
+++ trunk/blender/release/scripts/io/mesh_skin.py 2009-10-14 15:06:42 UTC
(rev 23840)
@@ -221,7 +221,7 @@
return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]),
ord_ind(verts[2], verts[3]), ord_ind(verts[3], verts[0])
-def mesh_faces_extend(me, faces):
+def mesh_faces_extend(me, faces, mat_idx = 0):
orig_facetot = len(me.faces)
new_facetot = len(faces)
me.add_geometry(0, 0, new_facetot)
@@ -233,8 +233,10 @@
f = [v.index for v in faces[i]]
if len(f)==4 and f[3]==0:
f = f[1], f[2], f[3], f[0]
-
- me_faces[orig_facetot+i].verts_raw = f
+
+ mf = me_faces[orig_facetot+i]
+ mf.verts_raw = f
+ mf.material_index = mat_idx
i+=1
# end utils
@@ -605,7 +607,7 @@
except: pass
if 1: # 2.5
- mesh_faces_extend(me, faces)
+ mesh_faces_extend(me, faces, ob.active_material_index)
me.update(calc_edges=True)
else:
me.faces.extend(faces, smooth = True)
Modified: trunk/blender/release/scripts/ui/buttons_render.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_render.py 2009-10-14 14:58:18 UTC
(rev 23839)
+++ trunk/blender/release/scripts/ui/buttons_render.py 2009-10-14 15:06:42 UTC
(rev 23840)
@@ -45,6 +45,9 @@
col.itemO("scene.render_layer_remove", icon='ICON_ZOOMOUT',
text="")
rl = rd.layers[rd.active_layer_index]
+
+ if rl:
+ layout.itemR(rl, "name")
split = layout.split()
Modified: trunk/blender/release/scripts/ui/buttons_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-14 14:58:18 UTC
(rev 23839)
+++ trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-14 15:06:42 UTC
(rev 23840)
@@ -23,7 +23,6 @@
class SCENE_PT_unit(SceneButtonsPanel):
__label__ = "Units"
- __default_closed__ = True
COMPAT_ENGINES = set(['BLENDER_RENDER'])
def draw(self, context):
@@ -41,7 +40,6 @@
class SCENE_PT_keying_sets(SceneButtonsPanel):
__label__ = "Keying Sets"
- __default_closed__ = True
def draw(self, context):
layout = self.layout
@@ -75,7 +73,6 @@
class SCENE_PT_keying_set_paths(SceneButtonsPanel):
__label__ = "Active Keying Set"
- __default_closed__ = True
def poll(self, context):
return (context.scene != None) and
(context.scene.active_keying_set != None)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
