[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48996] branches/soc-2011-tomato: Merging r48992 through r48995 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jul 17 12:46:33 CEST 2012
Revision: 48996
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48996
Author: nazgul
Date: 2012-07-17 10:46:32 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Merging r48992 through r48995 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48992
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48995
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_node/SConscript
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-tomato/source/blender/windowmanager/SConscript
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-48991
+ /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-48995
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-07-17 10:46:32 UTC (rev 48996)
@@ -524,6 +524,14 @@
int i;
float min[2], max[2];
+ if (tot_feather_point < 4) {
+ /* self-intersection works only for quads at least,
+ * in other cases polygon can't be self-intersecting anyway
+ */
+
+ return;
+ }
+
/* find min/max corners of mask to build buckets in that space */
INIT_MINMAX2(min, max);
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-48991
+ /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-48995
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt 2012-07-17 10:46:32 UTC (rev 48996)
@@ -59,4 +59,8 @@
add_definitions(-DWITH_INTERNATIONAL)
endif()
+if(WITH_COMPOSITOR)
+ add_definitions(-DWITH_COMPOSITOR)
+endif()
+
blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/SConscript
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/SConscript 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/SConscript 2012-07-17 10:46:32 UTC (rev 48996)
@@ -25,4 +25,7 @@
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
+if env['WITH_BF_COMPOSITOR']:
+ defs.append("WITH_COMPOSITOR")
+
env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf )
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c 2012-07-17 10:46:32 UTC (rev 48996)
@@ -721,11 +721,14 @@
if (node->flag & NODE_MUTED)
UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
+#ifdef WITH_COMPOSITOR
if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) {
if (COM_isHighlightedbNode(node)) {
UI_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f);
}
}
+#endif
+
uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);
uiRoundBox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
@@ -885,11 +888,15 @@
if (node->flag & NODE_MUTED)
UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
+#ifdef WITH_COMPOSITOR
if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) {
if (COM_isHighlightedbNode(node)) {
UI_ThemeColorBlend(color_id, TH_ACTIVE, 0.5f);
}
}
+#else
+ (void)ntree;
+#endif
uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
@@ -1136,9 +1143,13 @@
}
node_update_nodetree(C, snode->nodetree, 0.0f, 0.0f);
+
+#ifdef WITH_COMPOSITOR
if (snode->nodetree->type == NTREE_COMPOSIT) {
COM_startReadHighlights();
}
+#endif
+
node_draw_nodetree(C, ar, snode, snode->nodetree);
#if 0
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-48991
+ /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-48995
Modified: branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt 2012-07-17 10:46:32 UTC (rev 48996)
@@ -144,4 +144,8 @@
)
endif()
+if(WITH_COMPOSITOR)
+ add_definitions(-DWITH_COMPOSITOR)
+endif()
+
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-tomato/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/SConscript 2012-07-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/windowmanager/SConscript 2012-07-17 10:46:32 UTC (rev 48996)
@@ -43,4 +43,7 @@
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
+if env['WITH_BF_COMPOSITOR']:
+ defs.append("WITH_COMPOSITOR")
+
env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )
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-17 10:43:57 UTC (rev 48995)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c 2012-07-17 10:46:32 UTC (rev 48996)
@@ -206,11 +206,13 @@
BLI_strncpy(G.lib, G.main->name, FILE_MAX);
+#ifdef WITH_COMPOSITOR
if (1) {
extern void *COM_linker_hack;
extern void *COM_execute;
COM_linker_hack = COM_execute;
}
+#endif
}
void WM_init_splash(bContext *C)
More information about the Bf-blender-cvs
mailing list