[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59215] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Aug 17 18:09:24 CEST 2013
Revision: 59215
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59215
Author: gdh
Date: 2013-08-17 16:09:24 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59195 to r59213.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59195
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59213
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/release/scripts/templates_py/script_stub.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_anim_api.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_armature.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_ID.h
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Light.h
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_BucketManager.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_linklist_stack.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
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-59194
+ /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-59213
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-08-17 16:09:24 UTC (rev 59215)
@@ -2088,7 +2088,7 @@
class VIEW3D_MT_edit_mesh_clean(Menu):
- bl_label = "Clean"
+ bl_label = "Clean up"
def draw(self, context):
layout = self.layout
Modified: branches/soc-2013-cycles_mblur/release/scripts/templates_py/script_stub.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/templates_py/script_stub.py 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/release/scripts/templates_py/script_stub.py 2013-08-17 16:09:24 UTC (rev 59215)
@@ -9,6 +9,6 @@
filepath = os.path.join(os.path.dirname(bpy.data.filepath), filename)
global_namespace = {"__file__": filepath, "__name__": "__main__"}
-file = open(filepath, 'rb')
-exec(compile(file.read(), filepath, 'exec'), global_namespace)
-file.close()
+with open(filepath, 'rb') as file:
+ exec(compile(file.read(), filepath, 'exec'), global_namespace)
+
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_armature.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_armature.h 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_armature.h 2013-08-17 16:09:24 UTC (rev 59215)
@@ -132,8 +132,8 @@
/* like EBONE_VISIBLE */
#define PBONE_VISIBLE(arm, bone) ( \
- CHECK_TYPE_INLINE(arm, bArmature), \
- CHECK_TYPE_INLINE(bone, Bone), \
+ CHECK_TYPE_INLINE(arm, bArmature *), \
+ CHECK_TYPE_INLINE(bone, Bone *), \
(((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P)) \
)
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-17 16:09:24 UTC (rev 59215)
@@ -1264,14 +1264,14 @@
bm->totloop, bm->totface);
fprintf(stderr, "vertices:\n");
- BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
fprintf(stderr, " %d co=(%.3f %.3f %.3f) oflag=%x\n",
BM_elem_index_get(v), v->co[0], v->co[1], v->co[2],
v->oflags[bm->stackdepth - 1].f);
}
fprintf(stderr, "edges:\n");
- BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
fprintf(stderr, " %d v1=%d, v2=%d, oflag=%x\n",
BM_elem_index_get(e),
BM_elem_index_get(e->v1),
@@ -1280,7 +1280,7 @@
}
fprintf(stderr, "faces:\n");
- BM_ITER_MESH(f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
fprintf(stderr, " %d len=%d, oflag=%x\n",
BM_elem_index_get(f), f->len,
f->oflags[bm->stackdepth - 1].f);
Copied: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_linklist_stack.h (from rev 59213, trunk/blender/source/blender/blenlib/BLI_linklist_stack.h)
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_linklist_stack.h (rev 0)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_linklist_stack.h 2013-08-17 16:09:24 UTC (rev 59215)
@@ -0,0 +1,90 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLI_LINKLIST_STACK_H__
+#define __BLI_LINKLIST_STACK_H__
+
+/** \file BLI_linklist_stack.h
+ * \ingroup bli
+ * \brief BLI_LINKSTACK_*** wrapper macros for using a \a LinkNode
+ * to store a stack of pointers, using a single linked list
+ * allocated from a mempool.
+ *
+ * \note These macros follow STACK_* macros defined in 'BLI_utildefines.h'
+ * and should be kept (mostly) interchangeable.
+ *
+ * \note _##var##_type is a dummy var only used for typechecks.
+ */
+
+#define BLI_LINKSTACK_DECLARE(var, type) \
+ LinkNode *var; \
+ BLI_mempool *_##var##_pool; \
+ type _##var##_type
+
+#define BLI_LINKSTACK_INIT(var) { \
+ var = NULL; \
+ _##var##_pool = BLI_mempool_create(sizeof(LinkNode), 1, 64, 0); \
+} (void)0
+
+#define BLI_LINKSTACK_SIZE(var) \
+ BLI_mempool_count(_##var##_pool)
+
+/* check for typeof() */
+#ifdef __GNUC__
+#define BLI_LINKSTACK_PUSH(var, ptr) ( \
+ CHECK_TYPE_INLINE(ptr, typeof(_##var##_type)), \
+ BLI_linklist_prepend_pool(&(var), ptr, _##var##_pool))
+#define BLI_LINKSTACK_POP(var) \
+ (var ? (typeof(_##var##_type))BLI_linklist_pop_pool(&(var), _##var##_pool) : NULL)
+#define BLI_LINKSTACK_POP_ELSE(var, r) \
+ (var ? (typeof(_##var##_type))BLI_linklist_pop_pool(&(var), _##var##_pool) : r)
+#else /* non gcc */
+#define BLI_LINKSTACK_PUSH(var, ptr) ( \
+ BLI_linklist_prepend_pool(&(var), ptr, _##var##_pool))
+#define BLI_LINKSTACK_POP(var) \
+ (var ? BLI_linklist_pop_pool(&(var), _##var##_pool) : NULL)
+#define BLI_LINKSTACK_POP_ELSE(var, r) \
+ (var ? BLI_linklist_pop_pool(&(var), _##var##_pool) : r)
+#endif /* gcc check */
+
+#define BLI_LINKSTACK_SWAP(var_a, var_b) { \
+ CHECK_TYPE_PAIR(_##var_a##_type, _##var_b##_type); \
+ SWAP(LinkNode *, var_a, var_b); \
+ SWAP(BLI_mempool *, _##var_a##_pool, _##var_b##_pool); \
+} (void)0
+
+#define BLI_LINKSTACK_FREE(var) { \
+ BLI_mempool_destroy(_##var##_pool); \
+ _##var##_pool = NULL; (void)_##var##_pool; \
+ var = NULL; (void)var; \
+ (void)_##var##_type; \
+} (void)0
+
+#include "BLI_linklist.h"
+#include "BLI_mempool.h"
+
+#endif /* __BLI_LINKLIST_STACK_H__ */
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h 2013-08-17 16:09:24 UTC (rev 59215)
@@ -113,7 +113,7 @@
/* can be used in simple macros */
#define CHECK_TYPE_INLINE(val, type) \
- ((void)(((type *)0) != (val)))
+ ((void)(((type)0) != (val)))
#define SWAP(type, a, b) { \
type sw_ap; \
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt 2013-08-17 16:08:03 UTC (rev 59214)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt 2013-08-17 16:09:24 UTC (rev 59215)
@@ -25,7 +25,7 @@
# XXX allowing blenkernel and RNA includes in blenlib is a hack,
# but needed in a few places atm (bpath.c for instance)
-set(INC
+set(INC
.
# ../blenkernel # dont add this back!
../makesdna
@@ -125,6 +125,7 @@
BLI_kdtree.h
BLI_lasso.h
BLI_linklist.h
+ BLI_linklist_stack.h
BLI_listbase.h
BLI_math.h
BLI_math_base.h
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/smallhash.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list