[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21121] branches/soc-2009-yukishiro: broken merge!
Jingyuan Huang
jingyuan.huang at gmail.com
Wed Jun 24 06:41:48 CEST 2009
Revision: 21121
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21121
Author: yukishiro
Date: 2009-06-24 06:41:47 +0200 (Wed, 24 Jun 2009)
Log Message:
-----------
broken merge!
Modified Paths:
--------------
branches/soc-2009-yukishiro/intern/moto/include/MT_Matrix3x3.h
branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_buttons.py
branches/soc-2009-yukishiro/release/ui/space_image.py
branches/soc-2009-yukishiro/release/ui/space_logic.py
branches/soc-2009-yukishiro/release/ui/space_outliner.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_gpencil.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/gpencil.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframing.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.h
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_snap.c
branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_image.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-yukishiro/source/blender/python/BPY_extern.h
branches/soc-2009-yukishiro/source/blender/python/Makefile
branches/soc-2009-yukishiro/source/blender/python/generic/BGL.c
branches/soc-2009-yukishiro/source/blender/python/generic/BGL.h
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.c
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.h
branches/soc-2009-yukishiro/source/blender/python/generic/Makefile
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.h
branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.c
branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.h
branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
branches/soc-2009-yukishiro/source/blender/python/generic/euler.h
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.h
branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
branches/soc-2009-yukishiro/source/blender/python/generic/quat.h
branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
branches/soc-2009-yukishiro/source/blender/python/generic/vector.h
branches/soc-2009-yukishiro/source/blender/python/intern/Makefile
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/gameengine/Expressions/Makefile
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/Makefile
Removed Paths:
-------------
branches/soc-2009-yukishiro/source/blender/python/BPY_menus.c
branches/soc-2009-yukishiro/source/blender/python/BPY_menus.h
Property Changed:
----------------
branches/soc-2009-yukishiro/release/scripts/flt_toolbar.py
branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic.py
branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic_basic.py
branches/soc-2009-yukishiro/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2009-yukishiro/release/scripts/scripttemplate_metaball_create.py
branches/soc-2009-yukishiro/release/scripts/scripttemplate_pyconstraint.py
branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_objects.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/buttons_physic_cloth.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_buttons.py
branches/soc-2009-yukishiro/release/ui/space_image.py
branches/soc-2009-yukishiro/release/ui/space_logic.py
branches/soc-2009-yukishiro/release/ui/space_outliner.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_animsys.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_gpencil.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_report.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_sequence.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/gpencil.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/report.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_anim_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_action.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_animation.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_controller.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_image.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_vpaint.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2009-yukishiro/source/blender/python/BPY_extern.h
branches/soc-2009-yukishiro/source/blender/python/Makefile
branches/soc-2009-yukishiro/source/blender/python/epy_doc_gen.py
branches/soc-2009-yukishiro/source/blender/python/generic/BGL.c
branches/soc-2009-yukishiro/source/blender/python/generic/BGL.h
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.c
branches/soc-2009-yukishiro/source/blender/python/generic/Geometry.h
branches/soc-2009-yukishiro/source/blender/python/generic/Makefile
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.h
branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.c
branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.h
branches/soc-2009-yukishiro/source/blender/python/generic/euler.c
branches/soc-2009-yukishiro/source/blender/python/generic/euler.h
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.c
branches/soc-2009-yukishiro/source/blender/python/generic/matrix.h
branches/soc-2009-yukishiro/source/blender/python/generic/quat.c
branches/soc-2009-yukishiro/source/blender/python/generic/quat.h
branches/soc-2009-yukishiro/source/blender/python/generic/vector.c
branches/soc-2009-yukishiro/source/blender/python/generic/vector.h
branches/soc-2009-yukishiro/source/blender/python/intern/Makefile
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_compat.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_scriptlink.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.h
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_util.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_util.h
branches/soc-2009-yukishiro/source/blender/python/intern/stubs.c
branches/soc-2009-yukishiro/source/blender/python/rna_dump.py
branches/soc-2009-yukishiro/source/blender/python/simple_enum_gen.py
Modified: branches/soc-2009-yukishiro/intern/moto/include/MT_Matrix3x3.h
===================================================================
--- branches/soc-2009-yukishiro/intern/moto/include/MT_Matrix3x3.h 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/intern/moto/include/MT_Matrix3x3.h 2009-06-24 04:41:47 UTC (rev 21121)
@@ -98,6 +98,18 @@
m_el[0][2] = *m++; m_el[1][2] = *m++; m_el[2][2] = *m;
}
+ void setValue3x3(const float *m) {
+ m_el[0][0] = *m++; m_el[1][0] = *m++; m_el[2][0] = *m++;
+ m_el[0][1] = *m++; m_el[1][1] = *m++; m_el[2][1] = *m++;
+ m_el[0][2] = *m++; m_el[1][2] = *m++; m_el[2][2] = *m;
+ }
+
+ void setValue3x3(const double *m) {
+ m_el[0][0] = *m++; m_el[1][0] = *m++; m_el[2][0] = *m++;
+ m_el[0][1] = *m++; m_el[1][1] = *m++; m_el[2][1] = *m++;
+ m_el[0][2] = *m++; m_el[1][2] = *m++; m_el[2][2] = *m;
+ }
+
void setValue(MT_Scalar xx, MT_Scalar xy, MT_Scalar xz,
MT_Scalar yx, MT_Scalar yy, MT_Scalar yz,
MT_Scalar zx, MT_Scalar zy, MT_Scalar zz) {
@@ -194,6 +206,18 @@
*m++ = m_el[0][2]; *m++ = m_el[1][2]; *m++ = m_el[2][2]; *m = 0.0;
}
+ void getValue3x3(float *m) const {
+ *m++ = (float) m_el[0][0]; *m++ = (float) m_el[1][0]; *m++ = (float) m_el[2][0];
+ *m++ = (float) m_el[0][1]; *m++ = (float) m_el[1][1]; *m++ = (float) m_el[2][1];
+ *m++ = (float) m_el[0][2]; *m++ = (float) m_el[1][2]; *m++ = (float) m_el[2][2];
+ }
+
+ void getValue3x3(double *m) const {
+ *m++ = m_el[0][0]; *m++ = m_el[1][0]; *m++ = m_el[2][0];
+ *m++ = m_el[0][1]; *m++ = m_el[1][1]; *m++ = m_el[2][1];
+ *m++ = m_el[0][2]; *m++ = m_el[1][2]; *m++ = m_el[2][2];
+ }
+
MT_Quaternion getRotation() const;
MT_Matrix3x3& operator*=(const MT_Matrix3x3& m);
Property changes on: branches/soc-2009-yukishiro/release/scripts/flt_toolbar.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/scripts/scripttemplate_gamelogic_basic.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/scripts/scripttemplate_ipo_gen.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/scripts/scripttemplate_metaball_create.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/scripts/scripttemplate_pyconstraint.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -26,10 +26,10 @@
split = layout.split(percentage=0.65)
if ob:
- split.template_ID(context, ob, "data")
+ split.template_ID(ob, "data")
split.itemS()
elif arm:
- split.template_ID(context, space, "pin_id")
+ split.template_ID(space, "pin_id")
split.itemS()
if arm:
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -26,10 +26,10 @@
split = layout.split(percentage=0.65)
if ob:
- split.template_ID(context, ob, "data")
+ split.template_ID(ob, "data")
split.itemS()
elif arm:
- split.template_ID(context, space, "pin_id")
+ split.template_ID(space, "pin_id")
split.itemS()
if cam:
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -26,10 +26,10 @@
split = layout.split(percentage=0.65)
if ob:
- split.template_ID(context, ob, "data")
+ split.template_ID(ob, "data")
split.itemS()
elif curve:
- split.template_ID(context, space, "pin_id")
+ split.template_ID(space, "pin_id")
split.itemS()
if curve:
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -1,23 +0,0 @@
-
-import bpy
-
-class DataButtonsPanel(bpy.types.Panel):
- __space_type__ = "BUTTONS_WINDOW"
- __region_type__ = "WINDOW"
- __context__ = "data"
-
- def poll(self, context):
- return (context.object and context.object.type == 'EMPTY')
-
-class DATA_PT_empty(DataButtonsPanel):
- __idname__ = "DATA_PT_empty"
- __label__ = "Empty"
-
- def draw(self, context):
- layout = self.layout
- ob = context.object
-
- layout.itemR(ob, "empty_draw_type")
- layout.itemR(ob, "empty_draw_size")
-
-bpy.types.register(DATA_PT_empty)
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_empty.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -36,10 +36,10 @@
split = layout.split(percentage=0.65)
if ob:
- split.template_ID(context, ob, "data")
+ split.template_ID(ob, "data")
split.itemS()
elif lamp:
- split.template_ID(context, space, "pin_id")
+ split.template_ID(space, "pin_id")
split.itemS()
layout.itemS()
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -1,54 +0,0 @@
-
-import bpy
-
-class DataButtonsPanel(bpy.types.Panel):
- __space_type__ = "BUTTONS_WINDOW"
- __region_type__ = "WINDOW"
- __context__ = "data"
-
- def poll(self, context):
- return (context.lattice != None)
-
-class DATA_PT_lattice(DataButtonsPanel):
- __idname__ = "DATA_PT_lattice"
- __label__ = "Lattice"
-
- def poll(self, context):
- return (context.object and context.object.type == 'LATTICE')
-
- def draw(self, context):
- layout = self.layout
-
- ob = context.object
- lat = context.lattice
- space = context.space_data
-
- split = layout.split(percentage=0.65)
-
- if ob:
- split.template_ID(context, ob, "data")
- split.itemS()
- elif lat:
- split.template_ID(context, space, "pin_id")
- split.itemS()
-
- if lat:
- layout.itemS()
-
- row = layout.row()
- row.itemR(lat, "points_u")
- row.itemR(lat, "interpolation_type_u", expand=True)
-
- row = layout.row()
- row.itemR(lat, "points_v")
- row.itemR(lat, "interpolation_type_v", expand=True)
-
- row = layout.row()
- row.itemR(lat, "points_w")
- row.itemR(lat, "interpolation_type_w", expand=True)
-
- row = layout.row()
- row.itemR(lat, "outside")
- row.itemR(lat, "shape_keys")
-
-bpy.types.register(DATA_PT_lattice)
Property changes on: branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-06-24 03:16:42 UTC (rev 21120)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-06-24 04:41:47 UTC (rev 21121)
@@ -26,10 +26,10 @@
split = layout.split(percentage=0.65)
if ob:
- split.template_ID(context, ob, "data")
+ split.template_ID(ob, "data")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list