Revision: 49681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49681
Author: nazgul
Date: 2012-08-08 08:21:58 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Merging r49667 through r49680 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49680
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49666
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49680
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
2012-08-08 08:21:58 UTC (rev 49681)
@@ -152,7 +152,9 @@
~GHOST_SystemX11()
{
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
- XCloseIM(m_xim);
+ if (m_xim) {
+ XCloseIM(m_xim);
+ }
#endif
XCloseDisplay(m_display);
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
2012-08-08 08:21:58 UTC (rev 49681)
@@ -206,19 +206,19 @@
}
}
-void BLI_rcti_init_minmax(struct rcti *rect)
+void BLI_rcti_init_minmax(rcti *rect)
{
rect->xmin = rect->ymin = INT_MAX;
rect->xmax = rect->ymax = INT_MIN;
}
-void BLI_rctf_init_minmax(struct rctf *rect)
+void BLI_rctf_init_minmax(rctf *rect)
{
- rect->xmin = rect->ymin = FLT_MAX;
- rect->xmax = rect->ymax = FLT_MIN;
+ rect->xmin = rect->ymin = FLT_MAX;
+ rect->xmax = rect->ymax = -FLT_MAX;
}
-void BLI_rcti_do_minmax_v(struct rcti *rect, const int xy[2])
+void BLI_rcti_do_minmax_v(rcti *rect, const int xy[2])
{
if (xy[0] < rect->xmin) rect->xmin = xy[0];
if (xy[0] > rect->xmax) rect->xmax = xy[0];
@@ -226,7 +226,7 @@
if (xy[1] > rect->ymax) rect->ymax = xy[1];
}
-void BLI_rctf_do_minmax_v(struct rctf *rect, const float xy[2])
+void BLI_rctf_do_minmax_v(rctf *rect, const float xy[2])
{
if (xy[0] < rect->xmin) rect->xmin = xy[0];
if (xy[0] > rect->xmax) rect->xmax = xy[0];
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
2012-08-08 08:21:58 UTC (rev 49681)
@@ -110,6 +110,7 @@
*/
if ((editorNode->flag & NODE_MUTED) &&
editorNode->typeinfo->internal_connect) {
vector<InputSocket *> &inputsockets = this->getInputSockets();
+ vector<OutputSocket *> relinkedsockets;
bNodeTree *editorTree = (bNodeTree *) context->getbNodeTree();
SocketMap socketMap;
ListBase intlinks;
@@ -132,10 +133,37 @@
else {
createDefaultOutput(graph,
toSocket);
}
+
+ relinkedsockets.push_back(toSocket);
}
}
}
+ /* in some cases node could be marked as muted, but it wouldn't
have internal connections
+ * this happens in such cases as muted render layer node
+ *
+ * to deal with such cases create default operation for
not-relinked output sockets
+ */
+
+ for (unsigned int index = 0; index < outputsockets.size();
index++) {
+ OutputSocket *output = outputsockets[index];
+
+ if (output->isConnected()) {
+ bool relinked = false;
+ vector<OutputSocket *>::iterator it;
+
+ for (it = relinkedsockets.begin(); it !=
relinkedsockets.end(); it++) {
+ if (*it == output) {
+ relinked = true;
+ break;
+ }
+ }
+
+ if (!relinked)
+ createDefaultOutput(graph, output);
+ }
+ }
+
BLI_freelistN(&intlinks);
}
else {
Property changes on:
branches/soc-2011-tomato/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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49666
+ /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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49680
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
2012-08-08 08:21:58 UTC (rev 49681)
@@ -646,7 +646,7 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
"Location", "Location of vertex in normalized
space", -1.0f, 1.0f);
}
@@ -720,6 +720,6 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
"Location", "Location of vertex in normalized
space", -1.0f, 1.0f);
}
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
2012-08-08 08:21:58 UTC (rev 49681)
@@ -392,7 +392,7 @@
/* properties */
WM_operator_properties_mouse_select(ot);
- RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+ RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
"Location", "Location of vertex in normalized
space", -1.0f, 1.0f);
}
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_select.c
2012-08-08 08:15:56 UTC (rev 49680)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_select.c
2012-08-08 08:21:58 UTC (rev 49681)
@@ -236,11 +236,13 @@
CTX_DATA_BEGIN (C, Base *, base, visible_bases)
{
- if (base->object->data == obdata) {
- base->flag |= SELECT;
- base->object->flag = base->flag;
+ if ((base->flag & SELECT) == 0) {
+ if (base->object->data == obdata) {
+ base->flag |= SELECT;
+ base->object->flag = base->flag;
- changed = TRUE;
+ changed = TRUE;
+ }
}
}
CTX_DATA_END;
@@ -254,50 +256,56 @@
CTX_DATA_BEGIN (C, Base *, base, visible_bases)
{
- Object *ob = base->object;
- Material *mat1;
- int a, b;
+ if ((base->flag & SELECT) == 0) {
+ Object *ob = base->object;
+ Material *mat1;
+ int a, b;
- for (a = 1; a <= ob->totcol; a++) {
- mat1 = give_current_material(ob, a);
+ for (a = 1; a <= ob->totcol; a++) {
+ mat1 = give_current_material(ob, a);
- if (!use_texture) {
- if (mat1 == mat) {
- base->flag |= SELECT;
- changed = TRUE;
+ if (!use_texture) {
+ if (mat1 == mat) {
+ base->flag |= SELECT;
+ changed = TRUE;
+ }
}
- }
- else if (mat1 && use_texture) {
- for (b = 0; b < MAX_MTEX; b++) {
- if (mat1->mtex[b]) {
- if (tex == mat1->mtex[b]->tex) {
- base->flag |= SELECT;
- changed = TRUE;
- break;
+ else if (mat1 && use_texture) {
+ for (b = 0; b < MAX_MTEX; b++) {
+ if (mat1->mtex[b]) {
+ if (tex ==
mat1->mtex[b]->tex) {
+ base->flag |=
SELECT;
+ changed = TRUE;
+ break;
+ }
}
}
}
}
+
+ base->object->flag = base->flag;
}
-
- base->object->flag = base->flag;
}
CTX_DATA_END;
return changed;
}
-static int object_select_all_by_dup_group(bContext *C, Group *dup_group)
+static int object_select_all_by_dup_group(bContext *C, Object *ob)
{
int changed = FALSE;
+ Group *dup_group = (ob->transflag & OB_DUPLIGROUP) ? ob->dup_group :
NULL;
CTX_DATA_BEGIN (C, Base *, base, visible_bases)
{
- if (base->object->dup_group == dup_group) {
- base->flag |= SELECT;
- base->object->flag = base->flag;
+ if ((base->flag & SELECT) == 0) {
+ Group *dup_group_other = (base->object->transflag &
OB_DUPLIGROUP) ? base->object->dup_group : NULL;
+ if (dup_group == dup_group_other) {
+ base->flag |= SELECT;
+ base->object->flag = base->flag;
- changed = TRUE;
+ changed = TRUE;
+ }
}
}
CTX_DATA_END;
@@ -311,25 +319,27 @@
CTX_DATA_BEGIN (C, Base *, base, visible_bases)
{
- /* loop through other, then actives particles*/
- ParticleSystem *psys;
- ParticleSystem *psys_act;
+ if ((base->flag & SELECT) == 0) {
+ /* loop through other, then actives particles*/
+ ParticleSystem *psys;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
