[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39312] branches/soc-2011-tomato: Merging r39251 through r39311 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Thu Aug 11 20:16:30 CEST 2011
Revision: 39312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39312
Author: nazgul
Date: 2011-08-11 18:16:29 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Merging r39251 through r39311 from trunk into soc-2011-tomato
Splash screen is kept to be tomatoes.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39251
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39311
Modified Paths:
--------------
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/buildbot/master.cfg
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-39250
+ /trunk/blender:36831-39311
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/SConstruct 2011-08-11 18:16:29 UTC (rev 39312)
@@ -268,7 +268,8 @@
if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0
- env['FOUND_NDOF_DRIVERS'] = 0
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1:
Modified: branches/soc-2011-tomato/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/build_files/buildbot/master.cfg 2011-08-11 18:16:29 UTC (rev 39312)
@@ -116,7 +116,7 @@
add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'windows', generic_builder)
+add_builder(c, 'win64_scons', 'win64', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-08-11 18:16:29 UTC (rev 39312)
@@ -284,7 +284,7 @@
elif MACOSX_ARCHITECTURE == 'x86_64':
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
-# SpaceNavigator and related 3D mice
+# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
WITH_BF_3DMOUSE = True
#############################################################################
@@ -315,9 +315,6 @@
else:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
-if FOUND_NDOF_DRIVERS:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient']
-
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2011-08-11 18:16:29 UTC (rev 39312)
@@ -136,7 +136,7 @@
'BF_NO_ELBEEM',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
- 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'FOUND_NDOF_DRIVERS', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
+ 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
]
# Have options here that scons expects to be lists
@@ -439,7 +439,6 @@
(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
(BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
- (BoolVariable('FOUND_NDOF_DRIVERS', 'We detected NDOF libs or framework', False)),
(BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
('BF_3DMOUSE', '3d mouse library base path', ''),
('BF_3DMOUSE_INC', '3d mouse library include path', ''),
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2011-08-11 18:16:29 UTC (rev 39312)
@@ -159,18 +159,22 @@
GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
{
- UnregisterConnexionClient(m_clientID);
- CleanupConnexionHandlers();
- ghost_system = NULL;
- ndof_manager = NULL;
+ if (available())
+ {
+ UnregisterConnexionClient(m_clientID);
+ CleanupConnexionHandlers();
+ ghost_system = NULL;
+ ndof_manager = NULL;
+ }
}
-
-bool GHOST_NDOFManagerCocoa::available()
-{
- // extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
- // ^^ not needed since the entire framework is weak-linked
- return InstallConnexionHandlers != NULL;
- // this means that the driver is installed and dynamically linked to blender
+extern "C" {
+ bool GHOST_NDOFManagerCocoa::available()
+ {
+ extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
+ // Make the linker happy for the framework check (see link below for more info)
+ // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
+ return InstallConnexionHandlers != NULL;
+ // this means that the driver is installed and dynamically linked to blender
+ }
}
-
#endif // WITH_INPUT_NDOF
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2011-08-11 18:16:29 UTC (rev 39312)
@@ -43,17 +43,17 @@
/* 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 258
-#define BLENDER_SUBVERSION 1
+#define BLENDER_VERSION 259
+#define BLENDER_SUBVERSION 0
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR a
+#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE release
struct ListBase;
struct MemFile;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c 2011-08-11 18:16:29 UTC (rev 39312)
@@ -136,7 +136,7 @@
{"yard", "yards", "yd", NULL, "Yards", UN_SC_YD, 0.0, B_UNIT_DEF_NONE},
{"foot", "feet", "'", "ft", "Feet", UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
{"inch", "inches", "\"", "in", "Inches", UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
- {"thou", "thous", "mil", NULL, "Thous", UN_SC_MIL, 0.0, B_UNIT_DEF_NONE},
+ {"thou", "thou", "thou", "mil", "Thou", UN_SC_MIL, 0.0, B_UNIT_DEF_NONE}, /* plural for thou has no 's' */
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
};
static struct bUnitCollection buImperialLenCollecton = {buImperialLenDef, 4, 0, sizeof(buImperialLenDef)/sizeof(bUnitDef)};
Modified: branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c 2011-08-11 18:16:29 UTC (rev 39312)
@@ -1642,7 +1642,12 @@
static int gpencil_draw_modal (bContext *C, wmOperator *op, wmEvent *event)
{
tGPsdata *p= op->customdata;
- int estate = OPERATOR_PASS_THROUGH; /* default exit state - not handled, so let others have a share of the pie */
+ //int estate = OPERATOR_PASS_THROUGH; /* default exit state - not handled, so let others have a share of the pie */
+ /* currently, grease pencil conflicts with such operators as undo and set object mode
+ which makes behavior of operator totally unpredictable and crash for some cases.
+ the only way to solve this proper is to ger rid of pointers to data which can
+ chage stored in operator custom data (sergey) */
+ int estate = OPERATOR_RUNNING_MODAL;
// if (event->type == NDOF_MOTION)
// return OPERATOR_PASS_THROUGH;
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c 2011-08-11 17:42:54 UTC (rev 39311)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c 2011-08-11 18:16:29 UTC (rev 39312)
@@ -39,6 +39,7 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
#include "BKE_animsys.h"
#include "BKE_colortools.h"
@@ -2110,7 +2111,7 @@
}
else if(itemptr->type == &RNA_ShapeKey) {
Object *ob= (Object*)activeptr->data;
- Key *key= (Key*)itemptr->data;
+ Key *key= (Key*)itemptr->id.data;
split= uiLayoutSplit(sub, 0.75f, 0);
@@ -2322,10 +2323,11 @@
static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char *str, uiSearchItems *items)
{
- wmOperatorType *ot = WM_operatortype_first();
-
- for(; ot; ot= ot->next) {
-
+ GHashIterator *iter= WM_operatortype_iter();
+
+ for( ; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
+ wmOperatorType *ot= BLI_ghashIterator_getValue(iter);
+
if(BLI_strcasestr(ot->name, str)) {
if(WM_operator_poll((bContext*)C, ot)) {
char name[256];
@@ -2345,6 +2347,7 @@
}
}
}
+ BLI_ghashIterator_free(iter);
}
void uiTemplateOperatorSearch(uiLayout *layout)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list