[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59310] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Mon Aug 19 21:18:25 CEST 2013
Revision: 59310
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59310
Author: gdh
Date: 2013-08-19 19:18:25 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59252 to r59307.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59252
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59307
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.cpp
branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.h
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-cycles_mblur/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/guardedalloc/SConscript
branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_impl.cc
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_anim.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_key.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenkernel/SConscript
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/displist.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/effect.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/font.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object_deform.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_threads.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenlib/PIL_time.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/storage.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/threads.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_log.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_relationships.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_modifier.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_info/info_stats.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_snap.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_meta_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_particle_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/SConscript
branches/soc-2013-cycles_mblur/source/blender/makesrna/SConscript
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_array.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-cycles_mblur/source/creator/creator.c
branches/soc-2013-cycles_mblur/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GameLogic/SCA_IScene.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_MeshObject.h
Added Paths:
-----------
branches/soc-2013-cycles_mblur/intern/atomic/
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_sort.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/sort.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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,58822,58989
/branches/soc-2013-depsgraph_mt:57516
/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:57388-59251
+ /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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/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:57388-59307
Modified: branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.cpp 2013-08-19 19:04:39 UTC (rev 59309)
+++ branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.cpp 2013-08-19 19:18:25 UTC (rev 59310)
@@ -270,129 +270,3 @@
return dmesh->meshes;
}
-// qsort based on FreeBSD source (libkern\qsort.c)
-typedef int cmp_t(void *, const void *, const void *);
-static inline char *med3(char *, char *, char *, cmp_t *, void *);
-static inline void swapfunc(char *, char *, int, int);
-
-#define min(a, b) (a) < (b) ? a : b
-#define swapcode(TYPE, parmi, parmj, n) \
-{ \
- long i = (n) / sizeof(TYPE); \
- TYPE *pi = (TYPE *) (parmi); \
- TYPE *pj = (TYPE *) (parmj); \
- do { \
- TYPE t = *pi; \
- *pi++ = *pj; \
- *pj++ = t; \
- } while (--i > 0); \
-}
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
- es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static inline void swapfunc(char* a, char* b, int n, int swaptype)
-{
- if(swaptype <= 1)
- swapcode(long, a, b, n)
- else
- swapcode(char, a, b, n)
-}
-
-#define swap(a, b) \
- if (swaptype == 0) { \
- long t = *(long *)(a); \
- *(long *)(a) = *(long *)(b);\
- *(long *)(b) = t; \
- } else \
- swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
-#define CMP(t, x, y) (cmp((t), (x), (y)))
-
-static inline char *med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk)
-{
- return CMP(thunk, a, b) < 0 ?
- (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
- :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
-}
-
-void recast_qsort(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
-{
- char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
- int d, r, swaptype, swap_cnt;
-
-loop:
- SWAPINIT(a, es);
- swap_cnt = 0;
- if (n < 7) {
- for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
- for (pl = pm;
- pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
- pl -= es)
- swap(pl, pl - es);
- return;
- }
- pm = (char *)a + (n / 2) * es;
- if (n > 7) {
- pl = (char *)a;
- pn = (char *)a + (n - 1) * es;
- if (n > 40) {
- d = (n / 8) * es;
- pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
- pm = med3(pm - d, pm, pm + d, cmp, thunk);
- pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
- }
- pm = med3(pl, pm, pn, cmp, thunk);
- }
- swap((char *)a, pm);
- pa = pb = (char *)a + es;
-
- pc = pd = (char *)a + (n - 1) * es;
- for (;;) {
- while (pb <= pc && (r = CMP(thunk, pb, a)) <= 0) {
- if (r == 0) {
- swap_cnt = 1;
- swap(pa, pb);
- pa += es;
- }
- pb += es;
- }
- while (pb <= pc && (r = CMP(thunk, pc, a)) >= 0) {
- if (r == 0) {
- swap_cnt = 1;
- swap(pc, pd);
- pd -= es;
- }
- pc -= es;
- }
- if (pb > pc)
- break;
- swap(pb, pc);
- swap_cnt = 1;
- pb += es;
- pc -= es;
- }
- if (swap_cnt == 0) { /* Switch to insertion sort */
- for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
- for (pl = pm;
- pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
- pl -= es)
- swap(pl, pl - es);
- return;
- }
-
- pn = (char *)a + n * es;
- r = min(pa - (char *)a, pb - pa);
- vecswap((char *)a, pb - r, r);
- r = min(pd - pc, pn - pd - es);
- vecswap(pb, pn - r, r);
- if ((r = pb - pa) > es)
- recast_qsort(a, r / es, es, thunk, cmp);
- if ((r = pd - pc) > es) {
- /* Iterate rather than recurse to save stack space */
- a = pn - r;
- n = r / es;
- goto loop;
- }
-}
-
Modified: branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.h
===================================================================
--- branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.h 2013-08-19 19:04:39 UTC (rev 59309)
+++ branches/soc-2013-cycles_mblur/extern/recastnavigation/recast-capi.h 2013-08-19 19:18:25 UTC (rev 59310)
@@ -127,11 +127,6 @@
unsigned int *recast_polyMeshDetailGetMeshes(struct recast_polyMeshDetail *mesh, int *nmeshes);
-/* utility function: quick sort reentrant */
-typedef int recast_cmp_t(void *ctx, const void *a, const void *b);
-
-void recast_qsort(void *a, size_t n, size_t es, void *thunk, recast_cmp_t *cmp);
-
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py 2013-08-19 19:04:39 UTC (rev 59309)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py 2013-08-19 19:18:25 UTC (rev 59310)
@@ -385,6 +385,7 @@
description="Tile order for rendering",
items=enum_tile_order,
default='CENTER',
+ options=set(), # Not animatable!
)
cls.use_progressive_refine = BoolProperty(
name="Progressive Refine",
Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemWin32.cpp 2013-08-19 19:04:39 UTC (rev 59309)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemWin32.cpp 2013-08-19 19:18:25 UTC (rev 59310)
@@ -1110,7 +1110,7 @@
event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window);
/* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL
* will not be dispatched to OUR active window if we minimize one of OUR windows. */
- if(LOWORD(wParam)==WA_INACTIVE)
+ if (LOWORD(wParam)==WA_INACTIVE)
window->lostMouseCapture();
lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
@@ -1136,10 +1136,9 @@
* function when the application obtains a WM_PAINT message by using the GetMessage or
* PeekMessage function.
*/
- if(!window->m_inLiveResize)
- {
- event = processWindowEvent(GHOST_kEventWindowUpdate, window);
- ::ValidateRect(hwnd, NULL);
+ if (!window->m_inLiveResize) {
+ event = processWindowEvent(GHOST_kEventWindowUpdate, window);
+ ::ValidateRect(hwnd, NULL);
}
else {
eventHandled = true;
@@ -1163,15 +1162,13 @@
* message without calling DefWindowProc.
*/
/* we get first WM_SIZE before we fully init. So, do not dispatch before we continiously resizng */
- if(window->m_inLiveResize)
- {
- system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window));
- system->dispatchEvents();
- }
- else
- {
- event = processWindowEvent(GHOST_kEventWindowSize, window);
- }
+ if(window->m_inLiveResize) {
+ system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window));
+ system->dispatchEvents();
+ }
+ else {
+ event = processWindowEvent(GHOST_kEventWindowSize, window);
+ }
break;
case WM_CAPTURECHANGED:
window->lostMouseCapture();
@@ -1187,16 +1184,14 @@
* to perform any move or size change processing during the WM_WINDOWPOSCHANGED
* message without calling DefWindowProc.
*/
- /* see WM_SIZE comment*/
- if(window->m_inLiveResize)
- {
- system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window));
- system->dispatchEvents();
- }
- else
- {
- event = processWindowEvent(GHOST_kEventWindowMove, window);
- }
+ /* see WM_SIZE comment*/
+ if (window->m_inLiveResize) {
+ system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window));
+ system->dispatchEvents();
+ }
+ else {
+ event = processWindowEvent(GHOST_kEventWindowMove, window);
+ }
break;
////////////////////////////////////////////////////////////////////////
Modified: branches/soc-2013-cycles_mblur/intern/guardedalloc/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list