[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18889] branches/blender2.5/blender/source /blender/editors: 2.5
Ton Roosendaal
ton at blender.org
Mon Feb 9 17:52:33 CET 2009
Revision: 18889
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18889
Author: ton
Date: 2009-02-09 17:52:33 +0100 (Mon, 09 Feb 2009)
Log Message:
-----------
2.5
- Render: scene buttons RENDER and ANIM now work
- Nodes: text drawing for socket names back
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_buttons/Makefile
branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c
branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/Makefile 2009-02-09 15:50:09 UTC (rev 18888)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/Makefile 2009-02-09 16:52:33 UTC (rev 18889)
@@ -44,6 +44,7 @@
CPPFLAGS += -I../../blenkernel
CPPFLAGS += -I../../blenlib
CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
CPPFLAGS += -I../../imbuf
CPPFLAGS += -I../../python
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript 2009-02-09 15:50:09 UTC (rev 18888)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript 2009-02-09 16:52:33 UTC (rev 18889)
@@ -5,6 +5,6 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include'
+incs += ' ../../makesrna ../../render/extern/include'
env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), [], libtype=['core'], priority=[120] )
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c 2009-02-09 15:50:09 UTC (rev 18888)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c 2009-02-09 16:52:33 UTC (rev 18889)
@@ -40,9 +40,14 @@
#include "RE_pipeline.h"
+#include "RNA_access.h"
+#include "RNA_define.h"
+
#include "UI_interface.h"
#include "UI_resources.h"
+#include "WM_types.h"
+
#include "buttons_intern.h"
#define R_DISPLAYIMAGE 0
@@ -212,7 +217,8 @@
if(uiNewPanel(C, ar, block, "Render", "Render", 320, 0, 318, 204)==0) return;
uiBlockBeginAlign(block);
- uiDefBut(block, BUT,0,"RENDER", 369, 164, 191,37, 0, 0, 0, 0, 0, "Render the current frame (F12)");
+ uiDefButO(block, BUT, "SCREEN_OT_render", WM_OP_INVOKE_DEFAULT, "RENDER", 369, 164, 191,37, "Render the current frame (F12)");
+
#ifndef DISABLE_YAFRAY
/* yafray: on request, render engine menu is back again, and moved to Render panel */
uiDefButS(block, MENU, 0, "Rendering Engine %t|Blender Internal %x0|YafRay %x1",
@@ -287,12 +293,14 @@
{
Scene *scene= CTX_data_scene(C);
uiBlock *block;
-
+ uiBut *but;
+
block= uiBeginBlock(C, ar, "render_panel_anim", UI_EMBOSS, UI_HELV);
if(uiNewPanel(C, ar, block, "Anim", "Render", 640, 0, 318, 204) == 0) return;
- uiDefBut(block, BUT, 0, "ANIM", 692,142,192,47, 0, 0, 0, 0, 0, "Render the animation to disk from start to end frame, (Ctrl+F12)");
-
+ but= uiDefButO(block, BUT, "SCREEN_OT_render", WM_OP_INVOKE_DEFAULT, "ANIM", 692,142,192,47, "Render the animation to disk from start to end frame, (Ctrl+F12)");
+ RNA_boolean_set(uiButGetOperatorPtrRNA(but), "anim", 1);
+
uiBlockSetCol(block, TH_BUT_SETTING1);
uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, R_DOSEQ, 0, "Do Sequence",692,114,192,20, &scene->r.scemode, 0, 0, 0, 0, "Enables sequence output rendering (Default: 3D rendering)");
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-09 15:50:09 UTC (rev 18888)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-09 16:52:33 UTC (rev 18889)
@@ -823,11 +823,9 @@
}
}
else {
- /* XXX fix
UI_ThemeColor(TH_TEXT);
ui_rasterpos_safe(sock->locx+8.0f, sock->locy-5.0f, snode->aspect);
UI_DrawString(snode->curfont, sock->name, 0);
- */
}
}
}
@@ -835,11 +833,12 @@
/* socket outputs */
for(sock= node->outputs.first; sock; sock= sock->next) {
if(!(sock->flag & (SOCK_HIDDEN|SOCK_UNAVAIL))) {
+ float slen;
+ int ofs= 0;
+
socket_circle_draw(sock, NODE_SOCKSIZE);
- /* XXX fix
UI_ThemeColor(TH_TEXT);
- ofs= 0;
slen= snode->aspect*UI_GetStringWidth(snode->curfont, sock->name, 0);
while(slen > node->width) {
ofs++;
@@ -847,7 +846,6 @@
}
ui_rasterpos_safe(sock->locx-8.0f-slen, sock->locy-5.0f, snode->aspect);
UI_DrawString(snode->curfont, sock->name+ofs, 0);
- */
}
}
More information about the Bf-blender-cvs
mailing list