[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57989] branches/soc-2013-depsgraph_mt: Merging r57962 through r57988 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jul 4 11:23:22 CEST 2013
Revision: 57989
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57989
Author: nazgul
Date: 2013-07-04 09:23:21 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Merging r57962 through r57988 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57988
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_relations.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_keymap.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-57961
+ /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-57988
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-04 09:23:21 UTC (rev 57989)
@@ -1115,10 +1115,7 @@
def draw(self, context):
layout = self.layout
- ob = context.active_object
-
col = layout.column()
- col.active = ob.vertex_groups.active is not None
col.operator("object.vertex_group_normalize_all", text="Normalize All")
col.operator("object.vertex_group_normalize", text="Normalize")
col.operator("object.vertex_group_mirror", text="Mirror")
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_deform.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_deform.h 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_deform.h 2013-07-04 09:23:21 UTC (rev 57989)
@@ -40,6 +40,7 @@
struct bDeformGroup;
struct MDeformVert;
+struct bDeformGroup *BKE_defgroup_new(struct Object *ob, const char *name);
void defgroup_copy_list(struct ListBase *lb1, struct ListBase *lb2);
struct bDeformGroup *defgroup_duplicate(struct bDeformGroup *ingroup);
struct bDeformGroup *defgroup_find_name(struct Object *ob, const char *name);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c 2013-07-04 09:23:21 UTC (rev 57989)
@@ -51,6 +51,22 @@
#include "BKE_deform.h" /* own include */
+bDeformGroup *BKE_defgroup_new(Object *ob, const char *name)
+{
+ bDeformGroup *defgroup;
+
+ BLI_assert(OB_TYPE_SUPPORT_VGROUP(ob->type));
+
+ defgroup = MEM_callocN(sizeof(bDeformGroup), __func__);
+
+ BLI_strncpy(defgroup->name, name, sizeof(defgroup->name));
+
+ BLI_addtail(&ob->defbase, defgroup);
+ defgroup_unique_name(defgroup, ob);
+
+ return defgroup;
+}
+
void defgroup_copy_list(ListBase *outbase, ListBase *inbase)
{
bDeformGroup *defgroup, *defgroupn;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c 2013-07-04 09:23:21 UTC (rev 57989)
@@ -2301,10 +2301,12 @@
for (node = ntree->nodes.first; node; node = node->next) {
if (node->type == NODE_GROUP) {
bNodeTree *group = (bNodeTree *)node->id;
- bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node);
- tnode = node_get_active_id_recursive(active_key, group_key, group, idtype);
- if (tnode)
- return tnode;
+ if (group) {
+ bNodeInstanceKey group_key = BKE_node_instance_key(parent_key, ntree, node);
+ tnode = node_get_active_id_recursive(active_key, group_key, group, idtype);
+ if (tnode)
+ return tnode;
+ }
}
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c 2013-07-04 09:23:21 UTC (rev 57989)
@@ -914,12 +914,10 @@
if (obt && obt->rigidbody_constraint) {
rbc = obt->rigidbody_constraint;
if (rbc->ob1 == ob) {
- rbc->ob1 = NULL;
- rbc->flag |= RBC_FLAG_NEEDS_VALIDATE;
+ BKE_rigidbody_remove_constraint(scene, obt);
}
if (rbc->ob2 == ob) {
- rbc->ob2 = NULL;
- rbc->flag |= RBC_FLAG_NEEDS_VALIDATE;
+ BKE_rigidbody_remove_constraint(scene, obt);
}
}
}
@@ -938,10 +936,9 @@
RigidBodyWorld *rbw = scene->rigidbody_world;
RigidBodyCon *rbc = ob->rigidbody_constraint;
- if (rbw) {
- /* remove from rigidbody world, free object won't do this */
- if (rbw && rbw->physics_world && rbc->physics_constraint)
- RB_dworld_remove_constraint(rbw->physics_world, rbc->physics_constraint);
+ /* remove from rigidbody world, free object won't do this */
+ if (rbw && rbw->physics_world && rbc->physics_constraint) {
+ RB_dworld_remove_constraint(rbw->physics_world, rbc->physics_constraint);
}
/* remove object's settings */
BKE_rigidbody_free_constraint(ob);
Modified: branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c 2013-07-04 09:23:21 UTC (rev 57989)
@@ -268,8 +268,8 @@
}
f = BM_face_create(bm, vert_arr, ee, totv, 0);
}
- if ((facerep || face_arr) && f) {
- BM_elem_attrs_copy(bm, bm, facerep, f);
+ if ((facerep || (face_arr && face_arr[0])) && f) {
+ BM_elem_attrs_copy(bm, bm, facerep ? facerep : face_arr[0], f);
if (do_interp) {
i = 0;
BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) {
@@ -281,7 +281,8 @@
else {
interp_f = facerep;
}
- BM_loop_interp_from_face(bm, l, interp_f, TRUE, TRUE);
+ if (interp_f)
+ BM_loop_interp_from_face(bm, l, interp_f, TRUE, TRUE);
i++;
}
}
@@ -404,7 +405,8 @@
facerep = f1;
else
facerep = f2;
- BM_loop_interp_from_face(bm, l, facerep, TRUE, TRUE);
+ if (facerep)
+ BM_loop_interp_from_face(bm, l, facerep, TRUE, TRUE);
}
return f;
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_WrapOperation.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_WrapOperation.cpp 2013-07-04 08:52:27 UTC (rev 57988)
+++ branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_WrapOperation.cpp 2013-07-04 09:23:21 UTC (rev 57989)
@@ -42,12 +42,14 @@
inline float WrapOperation::getWrappedOriginalXPos(float x)
{
+ if (this->getWidth() == 0) return 0;
while (x < 0) x += this->m_width;
return fmodf(x, this->getWidth());
}
inline float WrapOperation::getWrappedOriginalYPos(float y)
{
+ if (this->getHeight() == 0) return 0;
while (y < 0) y += this->m_height;
return fmodf(y, this->getHeight());
}
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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
/trunk/blender/source/blender/editors/interface/interface.c:57395-57961
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list