[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11260] branches/soc-2007-mosani/source/ blender: Reverting bad design decisions.
Aaron Moore
two.a.ron at gmail.com
Fri Jul 13 04:19:56 CEST 2007
Revision: 11260
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11260
Author: mosani
Date: 2007-07-13 04:19:41 +0200 (Fri, 13 Jul 2007)
Log Message:
-----------
Reverting bad design decisions. Clearing away previous
plugin system setup changes to make way for a simpler
implementation of the same changes.
Modified Paths:
--------------
branches/soc-2007-mosani/source/blender/blenkernel/BKE_global.h
branches/soc-2007-mosani/source/blender/blenkernel/intern/blender.c
branches/soc-2007-mosani/source/blender/render/SConscript
branches/soc-2007-mosani/source/blender/src/SConscript
branches/soc-2007-mosani/source/blender/src/buttons_scene.c
Removed Paths:
-------------
branches/soc-2007-mosani/source/blender/render/RND_plugin_system/
Modified: branches/soc-2007-mosani/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2007-mosani/source/blender/blenkernel/BKE_global.h 2007-07-12 21:39:19 UTC (rev 11259)
+++ branches/soc-2007-mosani/source/blender/blenkernel/BKE_global.h 2007-07-13 02:19:41 UTC (rev 11260)
@@ -62,7 +62,6 @@
struct bSoundListener;
struct BMF_Font;
struct EditMesh;
-struct Renderer;
typedef struct Global {
@@ -81,7 +80,6 @@
struct bScreen *curscreen;
struct Object *obedit;
char editModeTitleExtra[64];
- struct Renderer *current_renderer;
/* fonts, allocated global data */
struct BMF_Font *font, *fonts, *fontss;
@@ -153,9 +151,6 @@
/* TEMPORARY TOGGLE FOR RENDER API BETWEEN CURRENT AND NEW SYSTEM */
char renderAPI_toggle;
/* END TEMPORARY TOGGLE */
-
- struct ListBase renderers; /* list of Renderer structures. Callbacks and
- * other renderer data. */
} Global;
Modified: branches/soc-2007-mosani/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/soc-2007-mosani/source/blender/blenkernel/intern/blender.c 2007-07-12 21:39:19 UTC (rev 11259)
+++ branches/soc-2007-mosani/source/blender/blenkernel/intern/blender.c 2007-07-13 02:19:41 UTC (rev 11260)
@@ -176,9 +176,7 @@
IMB_freeImBufdata(); /* imbuf lib */
- free_nodesystem();
-
- BLI_freelistN( &G.renderers ); /* free renderer list */
+ free_nodesystem();
}
void duplicatelist(ListBase *list1, ListBase *list2) /* copy from 2 to 1 */
Modified: branches/soc-2007-mosani/source/blender/render/SConscript
===================================================================
--- branches/soc-2007-mosani/source/blender/render/SConscript 2007-07-12 21:39:19 UTC (rev 11259)
+++ branches/soc-2007-mosani/source/blender/render/SConscript 2007-07-13 02:19:41 UTC (rev 11260)
@@ -4,13 +4,11 @@
cflags=''
sources = env.Glob('intern/source/*.c')
sources += env.Glob('render_api/source/*.c')
-sources += env.Glob('RND_plugin_system/source/*.c')
incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
incs += ' ../quicktime ../include ../../kernel/gen_messaging'
incs += ' render_api/include'
-incs += ' RND_plugin_system/include'
defs = []
Modified: branches/soc-2007-mosani/source/blender/src/SConscript
===================================================================
--- branches/soc-2007-mosani/source/blender/src/SConscript 2007-07-12 21:39:19 UTC (rev 11259)
+++ branches/soc-2007-mosani/source/blender/src/SConscript 2007-07-13 02:19:41 UTC (rev 11260)
@@ -13,7 +13,6 @@
incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
incs += ' ../quicktime #/intern/elbeem/extern'
incs += ' #/intern/ghost #/intern/opennl/extern'
-incs += ' ../render/RND_plugin_system/include ../render/render_api/include'
incs += ' ' + env['BF_PYTHON_INC']
Modified: branches/soc-2007-mosani/source/blender/src/buttons_scene.c
===================================================================
--- branches/soc-2007-mosani/source/blender/src/buttons_scene.c 2007-07-12 21:39:19 UTC (rev 11259)
+++ branches/soc-2007-mosani/source/blender/src/buttons_scene.c 2007-07-13 02:19:41 UTC (rev 11260)
@@ -94,7 +94,6 @@
#include "BSE_headerbuttons.h"
#include "RE_pipeline.h"
-#include "renderer.h"
#include "butspace.h" // own module
@@ -1266,8 +1265,7 @@
static void render_panel_render(void)
{
uiBlock *block;
- char str[256], render_menu[512] = "Rendering Engine %t";
- int render_index = 0;
+ char str[256];
block= uiNewBlock(&curarea->uiblocks, "render_panel_render", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Render", "Render", 320, 0, 318, 204)==0) return;
@@ -1281,23 +1279,15 @@
369+95,164,95,37, &G.renderAPI_toggle, 0,0,0,0,
"Temporary Toggle between Render API and Current System");
/* END TEMPORARY TOGGLE */
-
- initialize_internal_renderer( render_menu, &render_index );
- initialize_plugin_renderers( render_menu, &render_index );
- uiDefButS(block, MENU, B_SWITCHRENDER, render_menu,
- 369, 142, 191, 20, &G.scene->r.renderer,
- 0, 0, 0, 0, "Choose rendering engine");
-/*
#ifndef DISABLE_YAFRAY
- / yafray: on request, render engine menu is back again, and moved to Render panel /
+ /* yafray: on request, render engine menu is back again, and moved to Render panel */
uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1",
369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");
#else
uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0",
369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");
-#endif / disable yafray /
-*/
+#endif /* disable yafray */
uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, R_OSA, B_DIFF, "OSA", 369,109,122,20,&G.scene->r.mode, 0, 0, 0, 0, "Enables Oversampling (Anti-aliasing)");
More information about the Bf-blender-cvs
mailing list