[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57925] branches/soc-2013-depsgraph_mt: Merging r57897 through r57924 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jul 2 08:40:06 CEST 2013
Revision: 57925
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57925
Author: nazgul
Date: 2013-07-02 06:40:05 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Merging r57897 through r57924 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57897
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57924
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/bmesh_class.h
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/keyframing.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57896
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57924
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-07-02 06:40:05 UTC (rev 57925)
@@ -215,7 +215,7 @@
row = layout.row()
sub = row.row(align=True)
- sub.operator("object.vertex_group_assign", text="Assign").new = False
+ sub.operator("object.vertex_group_assign", text="Assign")
sub.operator("object.vertex_group_remove_from", text="Remove")
sub = row.row(align=True)
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py 2013-07-02 06:40:05 UTC (rev 57925)
@@ -1312,13 +1312,13 @@
layout = self.layout
layout.operator_context = 'EXEC_AREA'
- layout.operator("object.vertex_group_assign", text="Assign to New Group").new = True
+ layout.operator("object.vertex_group_assign_new")
ob = context.active_object
if ob.mode == 'EDIT' or (ob.mode == 'WEIGHT_PAINT' and ob.type == 'MESH' and ob.data.use_paint_mask_vertex):
if ob.vertex_groups.active:
layout.separator()
- layout.operator("object.vertex_group_assign", text="Assign to Active Group").new = False
+ layout.operator("object.vertex_group_assign", text="Assign to Active Group")
layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").use_all_groups = False
layout.operator("object.vertex_group_remove_from", text="Remove from All").use_all_groups = True
layout.separator()
@@ -1938,8 +1938,8 @@
layout.operator("mesh.rip_move_fill")
layout.operator("mesh.split")
layout.operator_menu_enum("mesh.separate", "type")
- layout.operator("mesh.vert_connect")
- layout.operator("transform.vert_slide")
+ layout.operator("mesh.vert_connect", text="Connect")
+ layout.operator("transform.vert_slide", text="Slide")
layout.separator()
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h 2013-07-02 06:40:05 UTC (rev 57925)
@@ -79,6 +79,8 @@
void BKE_object_unlink(struct Object *ob);
bool BKE_object_exists_check(struct Object *obtest);
bool BKE_object_is_in_editmode(struct Object *ob);
+bool BKE_object_is_in_editmode_vgroup(struct Object *ob);
+bool BKE_object_is_in_wpaint_select_vert(struct Object *ob);
struct Object *BKE_object_add_only_object(struct Main *bmain, int type, const char *name);
struct Object *BKE_object_add(struct Main *bmain, struct Scene *scene, int type);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim_sys.c 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim_sys.c 2013-07-02 06:40:05 UTC (rev 57925)
@@ -1639,8 +1639,46 @@
return NULL;
}
+/* initialise default value for NlaEvalChannel, so that it doesn't blend things wrong */
+static void nlaevalchan_value_init(NlaEvalChannel *nec)
+{
+ PointerRNA *ptr = &nec->ptr;
+ PropertyRNA *prop = nec->prop;
+ int index = nec->index;
+
+ /* NOTE: while this doesn't work for all RNA properties as default values aren't in fact
+ * set properly for most of them, at least the common ones (which also happen to get used
+ * in NLA strips a lot, e.g. scale) are set correctly.
+ */
+ switch (RNA_property_type(prop)) {
+ case PROP_BOOLEAN:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = (float)RNA_property_boolean_get_default_index(ptr, prop, index);
+ else
+ nec->value = (float)RNA_property_boolean_get_default(ptr, prop);
+ break;
+ case PROP_INT:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = (float)RNA_property_int_get_default_index(ptr, prop, index);
+ else
+ nec->value = (float)RNA_property_int_get_default(ptr, prop);
+ break;
+ case PROP_FLOAT:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = RNA_property_float_get_default_index(ptr, prop, index);
+ else
+ nec->value = RNA_property_float_get_default(ptr, prop);
+ break;
+ case PROP_ENUM:
+ nec->value = (float)RNA_property_enum_get_default(ptr, prop);
+ break;
+ default:
+ break;
+ }
+}
+
/* verify that an appropriate NlaEvalChannel for this F-Curve exists */
-static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes, FCurve *fcu, short *newChan)
+static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes, FCurve *fcu)
{
NlaEvalChannel *nec;
NlaStrip *strip = nes->strip;
@@ -1674,22 +1712,23 @@
/* allocate a new struct for this if none found */
if (nec == NULL) {
nec = MEM_callocN(sizeof(NlaEvalChannel), "NlaEvalChannel");
- *newChan = 1;
BLI_addtail(channels, nec);
+ /* store property links for writing to the property later */
nec->ptr = new_ptr;
nec->prop = prop;
nec->index = fcu->array_index;
+
+ /* initialise value using default value of property [#35856] */
+ nlaevalchan_value_init(nec);
}
- else
- *newChan = 0;
/* we can now return */
return nec;
}
/* accumulate (i.e. blend) the given value on to the channel it affects */
-static void nlaevalchan_accumulate(NlaEvalChannel *nec, NlaEvalStrip *nes, short UNUSED(newChan), float value)
+static void nlaevalchan_accumulate(NlaEvalChannel *nec, NlaEvalStrip *nes, float value)
{
NlaStrip *strip = nes->strip;
short blendmode = strip->blendmode;
@@ -1756,7 +1795,7 @@
* otherwise, add the current channel to the buffer for efficiency
*/
if (necd)
- nlaevalchan_accumulate(necd, nes, 0, nec->value);
+ nlaevalchan_accumulate(necd, nes, nec->value);
else {
BLI_remlink(tmp_buffer, nec);
BLI_addtail(channels, nec);
@@ -1853,7 +1892,6 @@
for (fcu = strip->act->curves.first; fcu; fcu = fcu->next) {
NlaEvalChannel *nec;
float value = 0.0f;
- short newChan = -1;
/* check if this curve should be skipped */
if (fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED))
@@ -1875,9 +1913,9 @@
/* get an NLA evaluation channel to work with, and accumulate the evaluated value with the value(s)
* stored in this channel if it has been used already
*/
- nec = nlaevalchan_verify(ptr, channels, nes, fcu, &newChan);
+ nec = nlaevalchan_verify(ptr, channels, nes, fcu);
if (nec)
- nlaevalchan_accumulate(nec, nes, newChan, value);
+ nlaevalchan_accumulate(nec, nes, value);
}
/* unlink this strip's modifiers from the parent's modifiers again */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-02 06:40:05 UTC (rev 57925)
@@ -778,7 +778,7 @@
}
if (attribs->tottang) {
const float *tang = attribs->tang.array[i * 4 + index_in_face];
- glVertexAttrib3fvARB(attribs->tang.gl_index, tang);
+ glVertexAttrib4fvARB(attribs->tang.gl_index, tang);
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c 2013-07-02 05:54:28 UTC (rev 57924)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c 2013-07-02 06:40:05 UTC (rev 57925)
@@ -764,6 +764,24 @@
return false;
}
+bool BKE_object_is_in_editmode_vgroup(Object *ob)
+{
+ return (OB_TYPE_SUPPORT_VGROUP(ob->type) &&
+ BKE_object_is_in_editmode(ob));
+}
+
+bool BKE_object_is_in_wpaint_select_vert(Object *ob)
+{
+ if (ob->type == OB_MESH) {
+ Mesh *me = ob->data;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list