Revision: 49261
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49261
Author: campbellbarton
Date: 2012-07-26 17:15:28 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49256:49260
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49256
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49256
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49260
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface.c
2012-07-26 17:14:23 UTC (rev 49260)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface.c
2012-07-26 17:15:28 UTC (rev 49261)
@@ -3735,6 +3735,7 @@
else
type = BUT_GET_RNA_TIP; /* Fail-safe
solution... */
}
+
if (type == BUT_GET_RNAPROP_IDENTIFIER) {
if (but->rnaprop)
tmp =
BLI_strdup(RNA_property_identifier(but->rnaprop));
@@ -3772,12 +3773,15 @@
else if (ELEM(but->type, MENU, PULLDOWN)) {
MenuType *mt = uiButGetMenuType(but);
if (mt) {
- if (type == BUT_GET_RNA_LABEL)
- tmp =
BLI_strdup(RNA_struct_ui_name(mt->ext.srna));
- else {
- const char *t =
RNA_struct_ui_description(mt->ext.srna);
- if (t && t[0])
- tmp = BLI_strdup(t);
+ /* not all menus are from python */
+ if (mt->ext.srna) {
+ if (type == BUT_GET_RNA_LABEL)
+ tmp =
BLI_strdup(RNA_struct_ui_name(mt->ext.srna));
+ else {
+ const char *t =
RNA_struct_ui_description(mt->ext.srna);
+ if (t && t[0])
+ tmp =
BLI_strdup(t);
+ }
}
}
}
Property changes on:
branches/soc-2011-tomato/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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49256
+ /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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49260
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49256
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49260
Modified: branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
2012-07-26 17:14:23 UTC (rev 49260)
+++ branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
2012-07-26 17:15:28 UTC (rev 49261)
@@ -127,8 +127,17 @@
if (!bmd->object)
return derivedData;
- dm = bmd->object->derivedFinal;
+ /* 2.64 used this... */
+ /* dm = bmd->object->derivedFinal; */
+
+ /* but we want to make sure we can get the object
+ * in some cases the depsgraph fails us - especially for objects
+ * in other scenes when compositing */
+ if (bmd->object != ob) {
+ dm = mesh_get_derived_final(md->scene, bmd->object,
CD_MASK_MESH);
+ }
+
if (dm) {
DerivedMesh *result;
Modified:
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
2012-07-26 17:14:23 UTC (rev 49260)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
2012-07-26 17:15:28 UTC (rev 49261)
@@ -32,6 +32,10 @@
#include <stdio.h>
#include <string.h>
+#if WIN32
+#include <Windows.h>
+#endif
+
#include "MEM_guardedalloc.h"
#include "MEM_CacheLimiterC-Api.h"
@@ -336,6 +340,31 @@
extern void free_fmodifiers_copybuf(void);
extern void free_posebuf(void);
+#if WIN32
+/* read console events until there is a keyboard event, then return */
+static void wait_for_console_key(void)
+{
+ HANDLE hConsoleInput;
+
+ hConsoleInput = GetStdHandle(STD_INPUT_HANDLE);
+
+ if (hConsoleInput && FlushConsoleInputBuffer(hConsoleInput)) {
+ for(;;) {
+ INPUT_RECORD buffer;
+ DWORD ignored;
+
+ if (!ReadConsoleInput(hConsoleInput, &buffer, 1,
&ignored)) {
+ break;
+ }
+
+ if (buffer.EventType == KEY_EVENT) {
+ break;
+ }
+ }
+ }
+}
+#endif
+
/* called in creator.c even... tsk, split this! */
/* note, doesnt run exit() call WM_exit() for that */
void WM_exit_ext(bContext *C, const short do_python)
@@ -459,10 +488,10 @@
printf("\nBlender quit\n");
#ifdef WIN32
- /* ask user to press enter when in debug mode */
+ /* ask user to press a key when in debug mode */
if (G.debug & G_DEBUG) {
- printf("press enter key to exit...\n\n");
- getchar();
+ printf("Press any key to exit . . .\n\n");
+ wait_for_console_key();
}
#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
