Revision: 38765
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38765
Author: mont29
Date: 2011-07-27 18:57:57 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Merging r38740 through r38764 from trunk into vgroup_modifiers.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38740
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38764
Modified Paths:
--------------
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_panel.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_add.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
branches/vgroup_modifiers/source/blender/editors/transform/transform.h
branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c
branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/intern/audaspace/OpenAL/
branches/vgroup_modifiers/release/scripts/templates/ui_menu.py
branches/vgroup_modifiers/release/scripts/templates/ui_menu_simple.py
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:38694-38739
+ /trunk/blender:38694-38739,38741-38764
Property changes on: branches/vgroup_modifiers/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:38694-38739
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:38694-38739,38741-38764
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
2011-07-27 18:57:57 UTC (rev 38765)
@@ -33,22 +33,21 @@
row.template_header()
if context.area.show_menus:
- sub = row.row(align=True)
- sub.menu("TEXT_MT_view")
- sub.menu("TEXT_MT_text")
+ row.menu("TEXT_MT_view")
+ row.menu("TEXT_MT_text")
if text:
- sub.menu("TEXT_MT_edit")
- sub.menu("TEXT_MT_format")
+ row.menu("TEXT_MT_edit")
+ row.menu("TEXT_MT_format")
- sub.menu("TEXT_MT_templates")
+ row.menu("TEXT_MT_templates")
if text and text.is_modified:
- row = layout.row()
- row.alert = True
- row.operator("text.resolve_conflict", text="", icon='HELP')
+ sub = row.row()
+ sub.alert = True
+ sub.operator("text.resolve_conflict", text="", icon='HELP')
- layout.template_ID(st, "text", new="text.new", unlink="text.unlink")
+ row.template_ID(st, "text", new="text.new", unlink="text.unlink")
row = layout.row(align=True)
row.prop(st, "show_line_numbers", text="")
Modified:
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
2011-07-27 18:57:57 UTC (rev 38765)
@@ -79,19 +79,22 @@
row.prop(toolsettings, "proportional_edit_falloff",
text="", icon_only=True)
# Snap
+ snap_element = toolsettings.snap_element
row = layout.row(align=True)
row.prop(toolsettings, "use_snap", text="")
row.prop(toolsettings, "snap_element", text="", icon_only=True)
- if toolsettings.snap_element != 'INCREMENT':
+ if snap_element != 'INCREMENT':
row.prop(toolsettings, "snap_target", text="")
- if obj and obj.mode == 'OBJECT':
- row.prop(toolsettings, "use_snap_align_rotation", text="")
- if toolsettings.snap_element == 'VOLUME':
+ if obj:
+ if obj.mode == 'OBJECT':
+ row.prop(toolsettings, "use_snap_align_rotation", text="")
+ elif obj.mode == 'EDIT':
+ row.prop(toolsettings, "use_snap_self", text="")
+
+ if snap_element == 'VOLUME':
row.prop(toolsettings, "use_snap_peel_object", text="")
- elif toolsettings.snap_element == 'FACE':
+ elif snap_element == 'FACE':
row.prop(toolsettings, "use_snap_project", text="")
- if toolsettings.use_snap_project and obj.mode == 'EDIT':
- row.prop(toolsettings, "use_snap_project_self", text="")
# OpenGL render
row = layout.row(align=True)
Property changes on:
branches/vgroup_modifiers/release/scripts/templates/ui_menu.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on:
branches/vgroup_modifiers/release/scripts/templates/ui_menu_simple.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified:
branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -1287,6 +1287,7 @@
QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset += sizeof(float)*4;
}
+ (void)offset;
}
curface++;
if(mface->v4) {
@@ -1327,6 +1328,7 @@
QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset +=
sizeof(float)*4;
}
+ (void)offset;
}
curface++;
i++;
Modified:
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -466,7 +466,6 @@
MDisps tris[2];
int vindex[4] = {0};
- S = 0;
for(i = 0; i < 2; i++)
for(y = 0; y < 4; y++)
for(x = 0; x < 4; x++)
Modified:
branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -2373,7 +2373,7 @@
/* Blancmange ([email protected]) */
k = -1.0f/(2.0f*(float)M_PI*blur*blur);
- fval=0;
+
for (ix = 0;ix< halfWidth;ix++){
weight = (float)exp(k*(ix*ix));
filter[halfWidth - ix] = weight;
Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -1423,6 +1423,8 @@
}
undoing= u;
+
+ (void)count;
}
/******************/
Modified:
branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c
2011-07-27 18:48:23 UTC (rev 38764)
+++ branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -1478,10 +1478,8 @@
bArmature *arm;
EditBone *bone, *curBone, *next;
int extend= RNA_boolean_get(op->ptr, "extend");
- ARegion *ar;
Object *obedit= CTX_data_edit_object(C);
arm= obedit->data;
- ar= CTX_wm_region(C);
view3d_operator_needs_opengl(C);
Modified:
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
2011-07-27 18:48:23 UTC (rev 38764)
+++
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -1879,7 +1879,6 @@
if(but->autocomplete_func || data->searchbox) {
changed= ui_textedit_autocomplete(C,
but, data);
update= 1; /* do live update for tab
key */
- retval= WM_UI_HANDLER_BREAK;
}
/* the hotkey here is not well defined, was
G.qual so we check all */
else if(event->shift || event->ctrl ||
event->alt || event->oskey) {
@@ -2325,8 +2324,8 @@
if(fac != 1.0f) {
/* snap in unit-space */
tempf /= fac;
- softmin /= fac;
- softmax /= fac;
+ /* softmin /= fac; */ /* UNUSED */
+ /* softmax /= fac; */ /* UNUSED */
softrange /= fac;
}
@@ -3469,13 +3468,13 @@
CurveMapping *cumap= (CurveMapping*)but->poin;
CurveMap *cuma= cumap->cm+cumap->cur;
CurveMapPoint *cmp= cuma->curve;
- float fx, fy, zoomx, zoomy, offsx, offsy;
+ float fx, fy, zoomx, zoomy /*, offsx, offsy */ /* UNUSED */;
int a, changed= 0;
zoomx= (but->x2-but->x1)/(cumap->curr.xmax-cumap->curr.xmin);
zoomy= (but->y2-but->y1)/(cumap->curr.ymax-cumap->curr.ymin);
- offsx= cumap->curr.xmin;
- offsy= cumap->curr.ymin;
+ /* offsx= cumap->curr.xmin; */
+ /* offsy= cumap->curr.ymin; */
if(snap) {
float d[2];
Modified:
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
===================================================================
---
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
2011-07-27 18:48:23 UTC (rev 38764)
+++
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
2011-07-27 18:57:57 UTC (rev 38765)
@@ -149,10 +149,10 @@
uiBut *roundbox;
} uiLayoutItemBx;
-typedef struct uiLayoutItemSplt {
+typedef struct uiLayoutItemSplit {
uiLayout litem;
float percentage;
-} uiLayoutItemSplt;
+} uiLayoutItemSplit;
typedef struct uiLayoutItemRoot {
uiLayout litem;
@@ -1615,7 +1615,7 @@
int x, y, w, tot, totw, neww, itemw, minw, itemh, offset;
int fixedw, freew, fixedx, freex, flag= 0, lastw= 0;
- x= litem->x;
+ /* x= litem->x; */ /* UNUSED */
y= litem->y;
w= litem->w;
totw= 0;
@@ -2020,7 +2020,7 @@
static void ui_litem_layout_split(uiLayout *litem)
{
- uiLayoutItemSplt *split= (uiLayoutItemSplt*)litem;
+ uiLayoutItemSplit *split= (uiLayoutItemSplit*)litem;
uiItem *item;
float percentage;
const int tot= BLI_countlist(&litem->items);
@@ -2242,9 +2242,9 @@
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage, int align)
{
- uiLayoutItemSplt *split;
+ uiLayoutItemSplit *split;
- split= MEM_callocN(sizeof(uiLayoutItemSplt), "uiLayoutItemSplt");
+ split= MEM_callocN(sizeof(uiLayoutItemSplit), "uiLayoutItemSplit");
split->litem.item.type= ITEM_LAYOUT_SPLIT;
split->litem.root= layout->root;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
