Revision: 30595
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30595
Author: kjym3
Date: 2010-07-21 21:12:18 +0200 (Wed, 21 Jul 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 30594.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30594
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/datafiles/brushicons/add.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/blur.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/clone.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/darken.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/lighten.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/mix.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/multiply.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/smear.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/soften.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/subtract.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/texdraw.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/vertexdraw.png
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/add.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blur.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/clone.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/darken.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/lighten.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/mix.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/multiply.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/smear.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/soften.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/subtract.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/vertexdraw.png.c
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/add.png (from
rev 30594, trunk/blender/release/datafiles/brushicons/add.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/blur.png (from
rev 30594, trunk/blender/release/datafiles/brushicons/blur.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/clone.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/clone.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/darken.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/darken.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/lighten.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/lighten.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/mix.png (from
rev 30594, trunk/blender/release/datafiles/brushicons/mix.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/multiply.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/multiply.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/smear.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/smear.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/soften.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/soften.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/subtract.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/subtract.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/texdraw.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/texdraw.png)
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/release/datafiles/brushicons/vertexdraw.png
(from rev 30594, trunk/blender/release/datafiles/brushicons/vertexdraw.png)
===================================================================
(Binary files differ)
Modified: branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
2010-07-21 19:12:18 UTC (rev 30595)
@@ -2782,7 +2782,7 @@
# Set the action active
for my_bone in ob_arms:
- if blenAction in my_bone.blenActionList:
+ if ob.animation_data and blenAction in
my_bone.blenActionList:
ob.animation_data.action = blenAction
# print '\t\tSetting Action!', blenAction
# scene.update(1)
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
2010-07-21 19:12:18 UTC (rev 30595)
@@ -562,23 +562,11 @@
toolsettings = context.tool_settings.image_paint
brush = toolsettings.brush
- wide_ui = context.region.width > narrowui
col = layout.split().column()
row = col.row()
- row.template_list(toolsettings, "brushes", toolsettings,
"active_brush_index", rows=2)
+ col.template_ID_preview(toolsettings, "brush", new="brush.add",
filter="is_imapaint_brush", rows=3, cols=8)
- col.template_ID(toolsettings, "brush", new="brush.add")
-
- if wide_ui:
- sub = layout.row(align=True)
- else:
- sub = layout.column(align=True)
- sub.prop_enum(brush, "imagepaint_tool", 'DRAW')
- sub.prop_enum(brush, "imagepaint_tool", 'SOFTEN')
- sub.prop_enum(brush, "imagepaint_tool", 'CLONE')
- sub.prop_enum(brush, "imagepaint_tool", 'SMEAR')
-
if brush:
col = layout.column()
col.template_color_wheel(brush, "color", value_slider=True)
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
2010-07-21 19:12:18 UTC (rev 30595)
@@ -1108,9 +1108,9 @@
settings = self.paint_settings(context)
brush = settings.brush
- col = layout.column();
+ if context.sculpt_object and context.tool_settings.sculpt:
+ col = layout.column();
- if context.sculpt_object and context.tool_settings.sculpt:
#if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'CLAY_TUBES',
'PINCH', 'CREASE', 'BLOB', 'FLATTEN', 'FILL', 'SCRAPE'):
if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'PINCH',
'CREASE', 'BLOB', 'FLATTEN', 'FILL', 'SCRAPE'):
col.prop(brush, "add_col", text="Add Color")
@@ -1118,7 +1118,7 @@
else:
col.prop(brush, "add_col", text="Color")
- col.separator()
+ col.separator()
col = layout.column()
col.label(text="Icon:")
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
2010-07-21 19:12:18 UTC (rev 30595)
@@ -63,7 +63,7 @@
void free_main(struct Main *mainvar);
void tag_main(struct Main *mainvar, int tag);
-int splitIDname(char *name, char *left, int *nr);
+void splitIDname(char *name, char *left, int *nr);
void rename_id(struct ID *id, char *name);
void test_idbutton(char *name);
void text_idbutton(struct ID *id, char *text);
@@ -85,3 +85,4 @@
#define ID_FALLBACK_NAME "Untitled"
#endif
+
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
2010-07-21 19:12:18 UTC (rev 30595)
@@ -144,6 +144,9 @@
if(!clmd->sim_parms->effector_weights)
clmd->sim_parms->effector_weights =
BKE_add_effector_weights(NULL);
+
+ if(clmd->point_cache)
+ clmd->point_cache->step = 1;
}
static BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float
epsilon)
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
2010-07-21 17:37:40 UTC (rev 30594)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
2010-07-21 19:12:18 UTC (rev 30595)
@@ -1009,7 +1009,7 @@
/* used by buttons.c library.c mball.c */
-int splitIDname(char *name, char *left, int *nr)
+void splitIDname(char *name, char *left, int *nr)
{
int a;
@@ -1017,21 +1017,19 @@
strncpy(left, name, 21);
a= strlen(name);
- if(a>1 && name[a-1]=='.') return a;
+ if(a>1 && name[a-1]=='.') return;
while(a--) {
if( name[a]=='.' ) {
left[a]= 0;
*nr= atol(name+a+1);
- return a;
+ return;
}
if( isdigit(name[a])==0 ) break;
left[a]= 0;
}
strcpy(left, name);
-
- return a;
}
static void sort_alpha_id(ListBase *lb, ID *id)
@@ -1093,7 +1091,8 @@
static int check_for_dupid(ListBase *lb, ID *id, char *name)
{
ID *idtest;
- int nr= 0, nrtest, a, left_len;
+ int nr= 0, nrtest, a;
+ const int maxtest=32;
char left[32], leftest[32], in_use[32];
/* make sure input name is terminated properly */
@@ -1110,25 +1109,22 @@
/* we have a dup; need to make a new name */
/* quick check so we can reuse one of first 32 ids if vacant */
- memset(in_use, 0, sizeof(in_use));
+ memset(in_use, 0, maxtest);
/* get name portion, number portion ("name.number") */
- left_len= splitIDname(name, left, &nr);
+ splitIDname( name, left, &nr);
/* if new name will be too long, truncate it */
if(nr>999 && strlen(left)>16) left[16]= 0;
else if(strlen(left)>17) left[17]= 0;
- if(left_len) {
- for(idtest= lb->first; idtest; idtest= idtest->next) {
- if( (id != idtest) &&
- (idtest->lib == NULL) &&
- (*name == *(idtest->name+2)) &&
- (strncmp(name, idtest->name+2,
left_len)==0) &&
- (splitIDname(idtest->name+2,
leftest, &nrtest) == left_len)
-
- ) {
- if(nrtest < sizeof(in_use))
+ for( idtest = lb->first; idtest; idtest = idtest->next ) {
+ if( id != idtest && idtest->lib == NULL ) {
+ splitIDname(idtest->name+2, leftest, &nrtest);
+ /* if base names match... */
+ /* optimized */
+ if( *left == *leftest && strcmp(left,
leftest)==0 ) {
+ if(nrtest < maxtest)
in_use[nrtest]= 1; /* mark
as used */
if(nr <= nrtest)
nr= nrtest+1; /*
track largest unused */
@@ -1137,7 +1133,7 @@
}
/* decide which value of nr to use */
- for(a=0; a < sizeof(in_use); a++) {
+ for(a=0; a<maxtest; a++) {
if(a>=nr) break; /* stop when we've check up to
biggest */
if( in_use[a]==0 ) { /* found an unused value */
nr = a;
@@ -1147,9 +1143,8 @@
/* If the original name has no numeric suffix,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
