Revision: 20453
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20453
Author: imbusy
Date: 2009-05-27 16:23:06 +0200 (Wed, 27 May 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/soc-2009-imbusy/config/win32-vc-config.py
branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-imbusy/release/datafiles/blenderbuttons
branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py
branches/soc-2009-imbusy/source/blender/blenkernel/BKE_library.h
branches/soc-2009-imbusy/source/blender/blenkernel/intern/library.c
branches/soc-2009-imbusy/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-imbusy/source/blender/editors/include/ED_object.h
branches/soc-2009-imbusy/source/blender/editors/include/UI_interface.h
branches/soc-2009-imbusy/source/blender/editors/include/UI_resources.h
branches/soc-2009-imbusy/source/blender/editors/interface/interface.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_api.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_layout.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_templates.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_utils.c
branches/soc-2009-imbusy/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-imbusy/source/blender/editors/object/editconstraint.c
branches/soc-2009-imbusy/source/blender/editors/object/object_intern.h
branches/soc-2009-imbusy/source/blender/editors/object/object_modifier.c
branches/soc-2009-imbusy/source/blender/editors/object/object_ops.c
branches/soc-2009-imbusy/source/blender/editors/space_file/file_draw.c
branches/soc-2009-imbusy/source/blender/editors/space_image/image_header.c
branches/soc-2009-imbusy/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-imbusy/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_sound.c
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-imbusy/source/blender/windowmanager/WM_types.h
Added Paths:
-----------
branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
Modified: branches/soc-2009-imbusy/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-imbusy/config/win32-vc-config.py 2009-05-27 13:32:09 UTC
(rev 20452)
+++ branches/soc-2009-imbusy/config/win32-vc-config.py 2009-05-27 14:23:06 UTC
(rev 20453)
@@ -88,7 +88,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
+WITH_BF_PLAYER = False
WITH_BF_ODE = True
BF_ODE = LIBDIR + '/ode'
Modified:
branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-05-27 13:32:09 UTC (rev 20452)
+++ branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-05-27 14:23:06 UTC (rev 20453)
@@ -407,6 +407,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\interface\interface_templates.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
>
</File>
@@ -639,6 +643,10 @@
Name="space_image"
>
<File
+
RelativePath="..\..\..\source\blender\editors\space_image\image_buttons.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_image\image_draw.c"
>
</File>
@@ -655,10 +663,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\space_image\image_panels.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_image\image_render.c"
>
</File>
Modified: branches/soc-2009-imbusy/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py
2009-05-27 13:32:09 UTC (rev 20452)
+++ branches/soc-2009-imbusy/release/ui/buttons_data_modifier.py
2009-05-27 14:23:06 UTC (rev 20453)
@@ -23,9 +23,9 @@
row.itemL();
for md in ob.modifiers:
- box = layout.template_modifier(context, md)
+ box = layout.template_modifier(md)
- if md.expanded:
+ if box:
if md.type == 'ARMATURE':
self.armature(box, md)
if md.type == 'ARRAY':
@@ -103,7 +103,7 @@
if md.fit_type == 'FIT_LENGTH':
layout.itemR(md, "length")
if md.fit_type == 'FIT_CURVE':
- layout.itemR(md, "curve")
+ layout.itemR(md, "curve")
split = layout.split()
@@ -150,9 +150,11 @@
def build(self, layout, md):
layout.itemR(md, "start")
layout.itemR(md, "length")
- layout.itemR(md, "randomize")
+
+ row = layout.row()
+ row.itemR(md, "randomize")
if md.randomize:
- layout.itemR(md, "seed")
+ row.itemR(md, "seed")
def cast(self, layout, md):
layout.itemR(md, "cast_type")
@@ -173,7 +175,7 @@
layout.itemL(text="See Collision panel.")
def curve(self, layout, md):
- layout.itemR(md, "curve")
+ layout.itemR(md, "object")
layout.itemR(md, "vertex_group")
layout.itemR(md, "deform_axis")
@@ -218,7 +220,7 @@
# Missing: "Reset" and "Recenter"
def lattice(self, layout, md):
- layout.itemR(md, "lattice")
+ layout.itemR(md, "object")
layout.itemR(md, "vertex_group")
def mask(self, layout, md):
@@ -230,7 +232,7 @@
layout.itemR(md, "inverse")
def meshdeform(self, layout, md):
- layout.itemR(md, "mesh")
+ layout.itemR(md, "object")
layout.itemR(md, "vertex_group")
layout.itemR(md, "invert")
layout.itemR(md, "precision")
@@ -312,9 +314,10 @@
def smooth(self, layout, md):
split = layout.split()
sub = split.column()
- sub.itemR(md, "x")
- sub.itemR(md, "y")
- sub.itemR(md, "z")
+ row = sub.row(align=True)
+ row.itemR(md, "x", toggle=True)
+ row.itemR(md, "y", toggle=True)
+ row.itemR(md, "z", toggle=True)
sub = split.column()
sub.itemR(md, "factor")
sub.itemR(md, "repeat")
@@ -353,9 +356,10 @@
sub = split.column()
sub.itemR(md, "normals")
if md.normals:
- sub.itemR(md, "x_normal", text="X")
- sub.itemR(md, "y_normal", text="Y")
- sub.itemR(md, "z_normal", text="Z")
+ row = sub.row(align=True)
+ row.itemR(md, "x_normal", text="X", toggle=True)
+ row.itemR(md, "y_normal", text="Y", toggle=True)
+ row.itemR(md, "z_normal", text="Z", toggle=True)
col = layout.column_flow()
col.itemR(md, "time_offset")
@@ -380,4 +384,5 @@
col.itemR(md, "width", slider=True)
col.itemR(md, "narrowness", slider=True)
-bpy.types.register(DATA_PT_modifiers)
\ No newline at end of file
+bpy.types.register(DATA_PT_modifiers)
+
Added: branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
(rev 0)
+++ branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
2009-05-27 14:23:06 UTC (rev 20453)
@@ -0,0 +1,59 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "object"
+
+ def poll(self, context):
+ ob = context.active_object
+ return (ob != None)
+
+class DATA_PT_constraints(DataButtonsPanel):
+ __idname__ = "DATA_PT_constraints"
+ __label__ = "Constraints"
+
+ def draw(self, context):
+ ob = context.active_object
+ layout = self.layout
+
+ row = layout.row()
+ row.item_menu_enumO("OBJECT_OT_constraint_add", "type")
+ row.itemL();
+
+ for con in ob.constraints:
+ box = layout.template_constraint(con)
+
+ if box:
+ if con.type == 'COPY_LOCATION':
+ self.copy_location(box, con)
+
+ def target_template(self, layout, con, subtargets=True):
+ layout.itemR(con, "target") # XXX limiting settings for only
'curves' or some type of object
+
+ if con.target and subtargets:
+ if con.target.type == "ARMATURE":
+ layout.itemR(con, "subtarget", text="Bone") #
XXX autocomplete
+
+ row = layout.row()
+ row.itemL(text="Head/Tail:")
+ row.itemR(con, "head_tail", text="")
+ elif con.target.type in ("MESH", "LATTICE"):
+ layout.itemR(con, "subtarget", text="Vertex
Group") # XXX autocomplete
+
+ def copy_location(self, layout, con):
+ self.target_template(layout, con)
+
+ row = layout.row(align=True)
+ row.itemR(con, "locate_like_x", text="X", toggle=True)
+ row.itemR(con, "invert_x", text="-", toggle=True)
+ row.itemR(con, "locate_like_y", text="Y", toggle=True)
+ row.itemR(con, "invert_y", text="-", toggle=True)
+ row.itemR(con, "locate_like_z", text="Z", toggle=True)
+ row.itemR(con, "invert_z", text="-", toggle=True)
+
+ layout.itemR(con, "offset")
+
+bpy.types.register(DATA_PT_constraints)
+
Modified: branches/soc-2009-imbusy/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/soc-2009-imbusy/source/blender/blenkernel/BKE_library.h
2009-05-27 13:32:09 UTC (rev 20452)
+++ branches/soc-2009-imbusy/source/blender/blenkernel/BKE_library.h
2009-05-27 14:23:06 UTC (rev 20453)
@@ -45,6 +45,7 @@
void id_lib_extern(struct ID *id);
void id_us_plus(struct ID *id);
+void id_us_min(struct ID *id);
int check_for_dupid(struct ListBase *lb, struct ID *id, char *name);
int new_id(struct ListBase *lb, struct ID *id, const char *name);
Modified: branches/soc-2009-imbusy/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/blenkernel/intern/library.c
2009-05-27 13:32:09 UTC (rev 20452)
+++ branches/soc-2009-imbusy/source/blender/blenkernel/intern/library.c
2009-05-27 14:23:06 UTC (rev 20453)
@@ -142,6 +142,12 @@
}
}
+void id_us_min(ID *id)
+{
+ if(id)
+ id->us--;
+}
+
ListBase *wich_libbase(Main *mainlib, short type)
{
switch( type ) {
Modified:
branches/soc-2009-imbusy/source/blender/editors/datafiles/blenderbuttons.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/editors/datafiles/blenderbuttons.c
2009-05-27 13:32:09 UTC (rev 20452)
+++ branches/soc-2009-imbusy/source/blender/editors/datafiles/blenderbuttons.c
2009-05-27 14:23:06 UTC (rev 20453)
@@ -1,5529 +1,5538 @@
-/* DataToC output of file <blenderbuttons> */
-
-int datatoc_blenderbuttons_size= 176721;
-char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0,
- 0, 2, 88, 0, 0, 2,128, 8, 6, 0, 0, 0, 64, 11, 6,158, 0, 0, 0,
9,112, 72, 89,115, 0, 0, 13,215, 0, 0, 13,215,
- 1, 66, 40,155,120, 0, 0, 10, 79,105, 67, 67, 80,
80,104,111,116,111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,105,
-108,101, 0, 0,120,218,157, 83,103, 84, 83,233, 22, 61,247,222,244, 66,
75,136,128,148, 75,111, 82, 21, 8, 32, 82, 66,139,128,
- 20,145, 38, 42, 33, 9, 16, 74,136, 33,161,217, 21, 81,193, 17, 69, 69, 4,
27,200,160,136, 3,142,142,128,140, 21, 81, 44, 12,
-138, 10,216, 7,228,
33,162,142,131,163,136,138,202,251,225,123,163,107,214,188,247,230,205,254,181,215,
62,231,172,243,157,179,
-207, 7,192, 8, 12,150, 72, 51, 81, 53,128, 12,169, 66, 30,
17,224,131,199,196,198,225,228, 46, 64,129, 10, 36,112, 0, 16, 8,
-179,100, 33,115,253, 35, 1, 0,248,126, 60, 60, 43, 34,192, 7,190, 0,
1,120,211, 11, 8, 0,192, 77,155,192, 48, 28,135,255,
- 15,234, 66,153, 92, 1,128,132, 1,192,116,145, 56, 75, 8,128, 20, 0,
64,122,142, 66,166, 0, 64, 70, 1,128,157,152, 38, 83,
- 0,160, 4, 0, 96,203, 99, 98,227, 0, 80, 45, 0, 96, 39,127,230,211,
0,128,157,248,153,123, 1, 0, 91,148, 33, 21, 1,160,
-145, 0, 32, 19,101,136, 68, 0,104, 59, 0,172,207, 86,138, 69, 0, 88, 48,
0, 20,102, 75,196, 57, 0,216, 45, 0, 48, 73, 87,
-102, 72, 0,176,183, 0,192,206, 16, 11,178, 0, 8, 12, 0, 48, 81,136,133,
41, 0, 4,123, 0, 96,200, 35, 35,120, 0,132,153,
- 0, 20, 70,242, 87, 60,241, 43,174, 16,231, 42, 0, 0,120,153,178, 60,185,
36, 57, 69,129, 91, 8, 45,113, 7, 87, 87, 46, 30,
- 40,206, 73, 23, 43, 20, 54, 97, 2, 97,154, 64, 46,194,121,153, 25, 50,129,
52, 15,224,243,204, 0, 0,160,145, 21, 17,224,131,
-243,253,120,206, 14,174,206,206, 54,142,182, 14, 95, 45,234,191, 6,255, 34,
98, 98,227,254,229,207,171,112, 64, 0, 0,225,116,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
