[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58365] tags/blender-2.68-release/blender: Merging r58341 through r58364 from trunk into blender-2.68-release
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jul 18 12:18:52 CEST 2013
Revision: 58365
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58365
Author: nazgul
Date: 2013-07-18 10:18:51 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
Merging r58341 through r58364 from trunk into blender-2.68-release
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58341
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58364
Modified Paths:
--------------
tags/blender-2.68-release/blender/intern/cycles/kernel/kernel_light.h
tags/blender-2.68-release/blender/release/datafiles/splash.png
tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_blender.h
tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_fcurve.h
tags/blender-2.68-release/blender/source/blender/blenkernel/intern/fcurve.c
tags/blender-2.68-release/blender/source/blender/collada/ArmatureImporter.cpp
tags/blender-2.68-release/blender/source/blender/collada/ControllerExporter.cpp
tags/blender-2.68-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.68-release/blender/source/blender/editors/space_action/action_edit.c
tags/blender-2.68-release/blender/source/blender/makesrna/intern/rna_wm_api.c
Property Changed:
----------------
tags/blender-2.68-release/blender/
tags/blender-2.68-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.68-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.68-release/blender
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:58341-58364
Modified: tags/blender-2.68-release/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- tags/blender-2.68-release/blender/intern/cycles/kernel/kernel_light.h 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/intern/cycles/kernel/kernel_light.h 2013-07-18 10:18:51 UTC (rev 58365)
@@ -271,7 +271,7 @@
ls->pdf = invarea;
if(type == LIGHT_SPOT) {
- /* spot light attentuation */
+ /* spot light attenuation */
float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2);
ls->eval_fac *= spot_light_attenuation(data1, data2, ls);
}
Modified: tags/blender-2.68-release/blender/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_blender.h 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_blender.h 2013-07-18 10:18:51 UTC (rev 58365)
@@ -41,8 +41,8 @@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION 267
-#define BLENDER_SUBVERSION 1
+#define BLENDER_VERSION 268
+#define BLENDER_SUBVERSION 0
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
#define BLENDER_MINVERSION 262
@@ -50,9 +50,9 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR b
+#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
extern char versionstr[]; /* from blender.c */
Modified: tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_fcurve.h 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/blenkernel/BKE_fcurve.h 2013-07-18 10:18:51 UTC (rev 58365)
@@ -216,7 +216,7 @@
int binarysearch_bezt_index(struct BezTriple array[], float frame, int arraylen, bool *r_replace);
/* get the time extents for F-Curve */
-void calc_fcurve_range(struct FCurve *fcu, float *min, float *max,
+bool calc_fcurve_range(struct FCurve *fcu, float *min, float *max,
const short do_sel_only, const short do_min_length);
/* get the bounding-box extents for F-Curve */
Modified: tags/blender-2.68-release/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- tags/blender-2.68-release/blender/source/blender/blenkernel/intern/fcurve.c 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/blenkernel/intern/fcurve.c 2013-07-18 10:18:51 UTC (rev 58365)
@@ -577,7 +577,7 @@
}
/* Calculate the extents of F-Curve's keyframes */
-void calc_fcurve_range(FCurve *fcu, float *start, float *end,
+bool calc_fcurve_range(FCurve *fcu, float *start, float *end,
const short do_sel_only, const short do_min_length)
{
float min = 999999999.0f, max = -999999999.0f;
@@ -621,6 +621,8 @@
*start = min;
*end = max;
+
+ return foundvert;
}
/* ----------------- Status Checks -------------------------- */
Modified: tags/blender-2.68-release/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- tags/blender-2.68-release/blender/source/blender/collada/ArmatureImporter.cpp 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/collada/ArmatureImporter.cpp 2013-07-18 10:18:51 UTC (rev 58365)
@@ -133,24 +133,28 @@
add_v3_v3v3(bone->tail, bone->head, vec);
// set parent tail
- if (parent && totchild == 1) {
- copy_v3_v3(parent->tail, bone->head);
+ if (parent) {
- // not setting BONE_CONNECTED because this would lock child bone location with respect to parent
- bone->flag |= BONE_CONNECTED;
-
// XXX increase this to prevent "very" small bones?
const float epsilon = 0.000001f;
// derive leaf bone length
- float length = len_v3v3(parent->head, parent->tail);
+ float length = len_v3v3(parent->head, bone->head);
if ((length < leaf_bone_length || totbone == 0) && length > epsilon) {
leaf_bone_length = length;
}
- // treat zero-sized bone like a leaf bone
- if (length <= epsilon) {
- add_leaf_bone(parent_mat, parent, node);
+ if (totchild == 1) {
+ copy_v3_v3(parent->tail, bone->head);
+
+ // not setting BONE_CONNECTED because this would lock child bone location with respect to parent
+ bone->flag |= BONE_CONNECTED;
+
+
+ // treat zero-sized bone like a leaf bone
+ if (length <= epsilon) {
+ add_leaf_bone(parent_mat, parent, node);
+ }
}
}
Modified: tags/blender-2.68-release/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- tags/blender-2.68-release/blender/source/blender/collada/ControllerExporter.cpp 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/collada/ControllerExporter.cpp 2013-07-18 10:18:51 UTC (rev 58365)
@@ -123,7 +123,7 @@
if (ob_arm) {
export_skin_controller(ob, ob_arm);
}
- if (key) {
+ if (key && this->export_settings->include_shapekeys) {
export_morph_controller(ob, key);
}
}
Modified: tags/blender-2.68-release/blender/source/blender/editors/interface/interface.c
===================================================================
--- tags/blender-2.68-release/blender/source/blender/editors/interface/interface.c 2013-07-18 10:08:28 UTC (rev 58364)
+++ tags/blender-2.68-release/blender/source/blender/editors/interface/interface.c 2013-07-18 10:18:51 UTC (rev 58365)
@@ -962,10 +962,10 @@
data_path = BLI_sprintfN("scene.%s", path);
MEM_freeN(path);
}
- else {
+ /*else {
printf("ERROR in %s(): Couldn't get path for scene property - %s\n",
__func__, RNA_property_identifier(but->rnaprop));
- }
+ }*/
}
}
else {
Property changes on: tags/blender-2.68-release/blender/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
/branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c:57516
+ /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
/branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c:57516
/trunk/blender/source/blender/editors/interface/interface.c:58341-58364
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list