[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59113] branches/soc-2013-depsgraph_mt: Merging r59104 through r59112 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Aug 13 17:09:19 CEST 2013
Revision: 59113
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59113
Author: nazgul
Date: 2013-08-13 15:09:19 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Merging r59104 through r59112 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59104
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59112
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge.logic.rst
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_passes.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/svm.cpp
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_material.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/material.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sound.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_ID.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_PythonInit.cpp
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_dev:58091-58422
/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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59103
+ /branches/ge_dev:58091-58422
/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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59112
Modified: branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge.logic.rst 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/doc/python_api/rst/bge.logic.rst 2013-08-13 15:09:19 UTC (rev 59113)
@@ -362,9 +362,9 @@
Use / as directory separator in path
You can use '//' at the start of the string to define a relative path;
- Blender replaces that string by the directory of the startup .blend or runtime file
- to make a full path name (doesn't change during the game, even if you load other .blend).
- The function also converts the directory separator to the local file system format.
+ Blender replaces that string by the directory of the current .blend or runtime file
+ to make a full path name. The function also converts the directory separator to
+ the local file system format.
:arg path: The path string to be converted/expanded.
:type path: string
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_passes.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_passes.h 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_passes.h 2013-08-13 15:09:19 UTC (rev 59113)
@@ -48,7 +48,7 @@
if(!(flag & PASS_ALL))
return;
- /* todo: add alpha treshold */
+ /* todo: add alpha threshold */
if(!(path_flag & PATH_RAY_TRANSPARENT)) {
if(sample == 0) {
if(flag & PASS_DEPTH) {
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.cpp 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.cpp 2013-08-13 15:09:19 UTC (rev 59113)
@@ -255,7 +255,7 @@
void ShaderGraph::find_dependencies(set<ShaderNode*>& dependencies, ShaderInput *input)
{
- /* find all nodes that this input dependes on directly and indirectly */
+ /* find all nodes that this input depends on directly and indirectly */
ShaderNode *node = (input->link)? input->link->parent: NULL;
if(node) {
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp 2013-08-13 15:09:19 UTC (rev 59113)
@@ -135,7 +135,7 @@
{
thread_scoped_lock pause_lock(pause_mutex);
- /* block for buffer acces and reset immediately. we can't do this
+ /* block for buffer access and reset immediately. we can't do this
* in the thread, because we need to allocate an OpenGL buffer, and
* that only works in the main thread */
thread_scoped_lock display_lock(display_mutex);
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/render/svm.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/svm.cpp 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/svm.cpp 2013-08-13 15:09:19 UTC (rev 59113)
@@ -504,7 +504,7 @@
void SVMCompiler::generate_multi_closure(ShaderNode *node, set<ShaderNode*>& done, set<ShaderNode*>& closure_done)
{
- /* todo: the weaks point here is that unlike the single closure sampling
+ /* todo: the weak point here is that unlike the single closure sampling
* we will evaluate all nodes even if they are used as input for closures
* that are unused. it's not clear what would be the best way to skip such
* nodes at runtime, especially if they are tangled up */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_material.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_material.h 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_material.h 2013-08-13 15:09:19 UTC (rev 59113)
@@ -88,7 +88,7 @@
/* rna api */
void material_append_id(struct ID *id, struct Material *ma);
-struct Material *material_pop_id(struct ID *id, int index, int remove_material_slot); /* index is an int because of RNA */
+struct Material *material_pop_id(struct ID *id, int index, bool remove_material_slot); /* index is an int because of RNA */
/* rendering */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/material.c 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/material.c 2013-08-13 15:09:19 UTC (rev 59113)
@@ -572,7 +572,7 @@
}
}
-Material *material_pop_id(ID *id, int index_i, int remove_material_slot)
+Material *material_pop_id(ID *id, int index_i, bool remove_material_slot)
{
short index = (short)index_i;
Material *ret = NULL;
@@ -583,34 +583,24 @@
ret = (*matar)[index];
id_us_min((ID *)ret);
- if (remove_material_slot) {
- if (*totcol <= 1) {
- *totcol = 0;
- MEM_freeN(*matar);
- *matar = NULL;
- }
- else {
- Material **mat;
- if (index + 1 != (*totcol))
- memmove((*matar) + index, (*matar) + (index + 1), sizeof(void *) * ((*totcol) - (index + 1)));
+ if (*totcol <= 1) {
+ *totcol = 0;
+ MEM_freeN(*matar);
+ *matar = NULL;
+ }
+ else {
+ if (index + 1 != (*totcol))
+ memmove((*matar) + index, (*matar) + (index + 1), sizeof(void *) * ((*totcol) - (index + 1)));
- (*totcol)--;
-
- mat = MEM_callocN(sizeof(void *) * (*totcol), "newmatar");
- memcpy(mat, *matar, sizeof(void *) * (*totcol));
- MEM_freeN(*matar);
+ (*totcol)--;
+ *matar = MEM_reallocN(*matar, sizeof(void *) * (*totcol));
+ test_object_materials(G.main, id);
+ }
- *matar = mat;
- test_object_materials(G.main, id);
- }
-
+ if (remove_material_slot) {
/* decrease mat_nr index */
data_delete_material_index_id(id, index);
}
-
- /* don't remove material slot, only clear it*/
- else
- (*matar)[index] = NULL;
}
}
@@ -1842,8 +1832,14 @@
mf->mat_nr = mat_nr;
}
/* remove material from mesh */
- for (a = 0; a < me->totcol; )
- if (me->mat[a] == ma) material_pop_id(&me->id, a, 1); else a++;
+ for (a = 0; a < me->totcol; ) {
+ if (me->mat[a] == ma) {
+ material_pop_id(&me->id, a, true);
+ }
+ else {
+ a++;
+ }
+ }
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sound.c 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sound.c 2013-08-13 15:09:19 UTC (rev 59113)
@@ -60,10 +60,6 @@
#include "BKE_sequencer.h"
#include "BKE_scene.h"
-// evil quiet NaN definition
-static const int NAN_INT = 0x7FC00000;
-#define NAN_FLT *((float *)(&NAN_INT))
-
#ifdef WITH_AUDASPACE
// evil global ;-)
static int sound_cfra;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_base.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_base.h 2013-08-13 14:46:39 UTC (rev 59112)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_base.h 2013-08-13 15:09:19 UTC (rev 59113)
@@ -80,6 +80,14 @@
#define MAXFLOAT ((float)3.40282347e+38)
#endif
+#if defined(__GNUC__)
+# define NAN_FLT __builtin_nanf("")
+#else
+/* evil quiet NaN definition */
+static const int NAN_INT = 0x7FC00000;
+# define NAN_FLT (*((float *)(&NAN_INT)))
+#endif
+
/* do not redefine functions from C99 or POSIX.1-2001 */
#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L))
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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list