sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

-Use getattr() now for constraints too. :)

Browse Source 
-Deleted old Buttons C code for RIGIDBODYJOINT constraint.
-"Realtime" Icon for Modifer was different in Template and RNA, i changed the Icon in RNA to match the template version, which is an eye instead of a cube.
This commit is contained in:
Thomas Dinges 2009-08-06 18:31:25 +00:00
parent 6b7e9336f0
commit e84e6664c2
3 changed files with 26 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
release/ui/buttons_object_constraint.py
View File

@ -10,49 +10,12 @@ class ConstraintButtonsPanel(bpy.types.Panel):
layout = self.layout
box = layout.template_constraint(con)
class_dict = self.__class__.__dict__
if box:
if con.type == "CHILD_OF":
self.child_of(box, con)
elif con.type == "TRACK_TO":
self.track_to(box, con)
elif con.type == "IK":
self.ik(box, con)
elif con.type == "FOLLOW_PATH":
self.follow_path(box, con)
elif con.type == "LIMIT_ROTATION":
self.limit_rotation(box, con)
elif con.type == "LIMIT_LOCATION":
self.limit_location(box, con)
elif con.type == "LIMIT_SCALE":
self.limit_scale(box, con)
elif con.type == "COPY_ROTATION":
self.copy_rotation(box, con)
elif con.type == "COPY_LOCATION":
self.copy_location(box, con)
elif con.type == "COPY_SCALE":
self.copy_scale(box, con)
#elif con.type == "SCRIPT":
# self.script(box, con)
elif con.type == "ACTION":
self.action(box, con)
elif con.type == "LOCKED_TRACK":
self.locked_track(box, con)
elif con.type == "LIMIT_DISTANCE":
self.limit_distance(box, con)
elif con.type == "STRETCH_TO":
self.stretch_to(box, con)
elif con.type == "FLOOR":
self.floor(box, con)
elif con.type == "RIGID_BODY_JOINT":
self.rigid_body(box, con)
elif con.type == "CLAMP_TO":
self.clamp_to(box, con)
elif con.type == "TRANSFORM":
self.transform(box, con)
elif con.type == "SHRINKWRAP":
self.shrinkwrap(box, con)
# match enum type to our functions, avoids a lookup table.
getattr(self, con.type)(box, con)
# show/key buttons here are most likely obsolete now, with
# keyframing functionality being part of every button
if con.type not in ("RIGID_BODY_JOINT", "NULL"):
@ -87,7 +50,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
elif con.target.type in ("MESH", "LATTICE"):
layout.item_pointerR(con, "subtarget", con.target, "vertex_groups", text="Vertex Group")
def child_of(self, layout, con):
def CHILD_OF(self, layout, con):
self.target_template(layout, con)
split = layout.split()
@ -114,7 +77,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemO("constraint.childof_set_inverse")
row.itemO("constraint.childof_clear_inverse")
def track_to(self, layout, con):
def TRACK_TO(self, layout, con):
self.target_template(layout, con)
row = layout.row()
@ -128,7 +91,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
self.space_template(layout, con)
def ik(self, layout, con):
def IK(self, layout, con):
self.target_template(layout, con)
layout.itemR(con, "pole_target")
@ -148,7 +111,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
flow.itemR(con, "targetless")
flow.itemR(con, "stretch")
def follow_path(self, layout, con):
def FOLLOW_PATH(self, layout, con):
self.target_template(layout, con)
row = layout.row()
@ -163,7 +126,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemR(con, "up", text="Up")
row.itemL()
def limit_rotation(self, layout, con):
def LIMIT_ROTATION(self, layout, con):
split = layout.split()
@ -196,7 +159,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Convert:")
row.itemR(con, "owner_space", text="")
def limit_location(self, layout, con):
def LIMIT_LOCATION(self, layout, con):
split = layout.split()
col = split.column()
@ -237,7 +200,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Convert:")
row.itemR(con, "owner_space", text="")
def limit_scale(self, layout, con):
def LIMIT_SCALE(self, layout, con):
split = layout.split()
col = split.column()
@ -278,7 +241,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Convert:")
row.itemR(con, "owner_space", text="")
def copy_rotation(self, layout, con):
def COPY_ROTATION(self, layout, con):
self.target_template(layout, con)
split = layout.split()
@ -305,7 +268,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
self.space_template(layout, con)
def copy_location(self, layout, con):
def COPY_LOCATION(self, layout, con):
self.target_template(layout, con)
split = layout.split()
@ -332,7 +295,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
self.space_template(layout, con)
def copy_scale(self, layout, con):
def COPY_SCALE(self, layout, con):
self.target_template(layout, con)
row = layout.row(align=True)
@ -344,9 +307,9 @@ class ConstraintButtonsPanel(bpy.types.Panel):
self.space_template(layout, con)
#def script(self, layout, con):
#def SCRIPT(self, layout, con):
def action(self, layout, con):
def ACTION(self, layout, con):
self.target_template(layout, con)
layout.itemR(con, "action")
@ -366,7 +329,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Convert:")
row.itemR(con, "owner_space", text="")
def locked_track(self, layout, con):
def LOCKED_TRACK(self, layout, con):
self.target_template(layout, con)
row = layout.row()
@ -377,7 +340,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Lock:")
row.itemR(con, "locked", expand=True)
def limit_distance(self, layout, con):
def LIMIT_DISTANCE(self, layout, con):
self.target_template(layout, con)
col = layout.column(align=True);
@ -388,7 +351,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Clamp Region:")
row.itemR(con, "limit_mode", text="")
def stretch_to(self, layout, con):
def STRETCH_TO(self, layout, con):
self.target_template(layout, con)
col = layout.column(align=True)
@ -404,7 +367,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Plane:")
row.itemR(con, "keep_axis", expand=True)
def floor(self, layout, con):
def FLOOR(self, layout, con):
self.target_template(layout, con)
row = layout.row()
@ -417,7 +380,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row.itemL(text="Min/Max:")
row.itemR(con, "floor_location", expand=True)
def rigid_body(self, layout, con):
def RIGID_BODY_JOINT(self, layout, con):
self.target_template(layout, con)
layout.itemR(con, "pivot_type")
@ -441,7 +404,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
#Missing: Limit arrays (not wrapped in RNA yet)
def clamp_to(self, layout, con):
def CLAMP_TO(self, layout, con):
self.target_template(layout, con)
row = layout.row()
@ -451,7 +414,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
row = layout.row()
row.itemR(con, "cyclic")
def transform(self, layout, con):
def TRANSFORM(self, layout, con):
self.target_template(layout, con)
layout.itemR(con, "extrapolate_motion", text="Extrapolate")
@ -500,7 +463,7 @@ class ConstraintButtonsPanel(bpy.types.Panel):
self.space_template(layout, con)
def shrinkwrap (self, layout, con):
def SHRINKWRAP (self, layout, con):
self.target_template(layout, con)
layout.itemR(con, "distance")

77
source/blender/editors/interface/interface_templates.c
View File

@ -911,82 +911,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
draw_constraint_spaceselect(block, con, xco, yco-(73+theight), is_armature_owner(ob), -1);
}
break;
#endif /* DISABLE_PYTHON */
/*case CONSTRAINT_TYPE_RIGIDBODYJOINT:
{
if (data->type==CONSTRAINT_RB_GENERIC6DOF) {
// Draw Pairs of LimitToggle+LimitValue
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 1, B_CONSTRAINT_TEST, "LinMinX", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum x limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[0]), -extremeLin, extremeLin, 0.1,0.5,"min x limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 1, B_CONSTRAINT_TEST, "LinMaxX", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum x limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[0]), -extremeLin, extremeLin, 0.1,0.5,"max x limit");
uiBlockEndAlign(block);
offsetY += 20;
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 2, B_CONSTRAINT_TEST, "LinMinY", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum y limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[1]), -extremeLin, extremeLin, 0.1,0.5,"min y limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 2, B_CONSTRAINT_TEST, "LinMaxY", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum y limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[1]), -extremeLin, extremeLin, 0.1,0.5,"max y limit");
uiBlockEndAlign(block);
offsetY += 20;
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 4, B_CONSTRAINT_TEST, "LinMinZ", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum z limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[2]), -extremeLin, extremeLin, 0.1,0.5,"min z limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 4, B_CONSTRAINT_TEST, "LinMaxZ", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum z limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[2]), -extremeLin, extremeLin, 0.1,0.5,"max z limit");
uiBlockEndAlign(block);
offsetY += 20;
}
if ((data->type==CONSTRAINT_RB_GENERIC6DOF) || (data->type==CONSTRAINT_RB_CONETWIST)) {
// Draw Pairs of LimitToggle+LimitValue /
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 8, B_CONSTRAINT_TEST, "AngMinX", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum x limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[3]), -extremeAngX, extremeAngX, 0.1,0.5,"min x limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 8, B_CONSTRAINT_TEST, "AngMaxX", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum x limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[3]), -extremeAngX, extremeAngX, 0.1,0.5,"max x limit");
uiBlockEndAlign(block);
offsetY += 20;
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 16, B_CONSTRAINT_TEST, "AngMinY", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum y limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[4]), -extremeAngY, extremeAngY, 0.1,0.5,"min y limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 16, B_CONSTRAINT_TEST, "AngMaxY", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum y limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[4]), -extremeAngY, extremeAngY, 0.1,0.5,"max y limit");
uiBlockEndAlign(block);
offsetY += 20;
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 32, B_CONSTRAINT_TEST, "AngMinZ", xco, yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use minimum z limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+togButWidth, yco-offsetY, (textButWidth-5), 18, &(data->minLimit[5]), -extremeAngZ, extremeAngZ, 0.1,0.5,"min z limit");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButBitS(block, TOG, 32, B_CONSTRAINT_TEST, "AngMaxZ", xco+(width-(textButWidth-5)-togButWidth), yco-offsetY, togButWidth, 18, &data->flag, 0, 24, 0, 0, "Use maximum z limit");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", xco+(width-textButWidth-5), yco-offsetY, (textButWidth), 18, &(data->maxLimit[5]), -extremeAngZ, extremeAngZ, 0.1,0.5,"max z limit");
uiBlockEndAlign(block);
}
}
break;
*/
#endif
case CONSTRAINT_TYPE_NULL:
{

2
source/blender/makesrna/intern/rna_modifier.c
View File

@ -1860,7 +1860,7 @@ void RNA_def_modifier(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Realtime);
RNA_def_property_ui_text(prop, "Realtime", "Realtime display of a modifier.");
RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Modifier_update");
RNA_def_property_ui_icon(prop, ICON_VIEW3D, 0);
RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 0);
prop= RNA_def_property(srna, "render", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Render);