[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49068] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49063:49067
Campbell Barton
ideasman42 at gmail.com
Thu Jul 19 15:07:33 CEST 2012
Revision: 49068
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49068
Author: campbellbarton
Date: 2012-07-19 13:07:33 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49063:49067
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49063
Modified Paths:
--------------
branches/soc-2011-tomato/doc/manpage/blender.1
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.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-49063
+ /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-49067
Modified: branches/soc-2011-tomato/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/soc-2011-tomato/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/graph.cpp 2012-07-19 13:06:39 UTC (rev 49067)
+++ branches/soc-2011-tomato/intern/cycles/render/graph.cpp 2012-07-19 13:07:33 UTC (rev 49068)
@@ -187,7 +187,10 @@
if(from->type != to->type) {
/* for closures we can't do automatic conversion */
if(from->type == SHADER_SOCKET_CLOSURE || to->type == SHADER_SOCKET_CLOSURE) {
- fprintf(stderr, "ShaderGraph connect: can only connect closure to closure.\n");
+ fprintf(stderr, "ShaderGraph connect: can only connect closure to closure "
+ "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderInput:%s, type:%d).\n",
+ from->parent->name.c_str(), from->name, (int)from->type,
+ to->parent->name.c_str(), to->name, (int)to->type);
return;
}
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-49063
+ /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-49067
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c 2012-07-19 13:06:39 UTC (rev 49067)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c 2012-07-19 13:07:33 UTC (rev 49068)
@@ -203,7 +203,7 @@
while (a--) {
if (bp->hide == 0) {
- if (bp->f1) {
+ if (bp->f1 & SELECT) {
action = SEL_DESELECT;
break;
}
@@ -225,7 +225,7 @@
while (a--) {
if (bp->hide == 0) {
- bp->f1 ^= 1;
+ bp->f1 ^= SELECT;
}
bp++;
}
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49063
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49067
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c 2012-07-19 13:06:39 UTC (rev 49067)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c 2012-07-19 13:07:33 UTC (rev 49068)
@@ -224,6 +224,10 @@
RNA_def_struct_ui_text(srna, "LatticePoint", "Point in the lattice grid");
RNA_def_struct_path_func(srna, "rna_LatticePoint_path");
+ prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "f1", 0);
+ RNA_def_property_ui_text(prop, "Point selected", "Selection status");
+
prop = RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
RNA_def_property_array(prop, 3);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
More information about the Bf-blender-cvs
mailing list