Revision: 42408
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42408
Author: campbellbarton
Date: 2011-12-04 16:22:53 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
remove old renderer struct member, was only used for setting yafray but was
still being checked in a few places,
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-12-04
16:07:50 UTC (rev 42407)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-12-04
16:22:53 UTC (rev 42408)
@@ -10403,13 +10403,6 @@
wrld->maxphystep = 5;
}
}
-
- if (main->versionfile < 249) {
- Scene *sce;
- for (sce= main->scene.first; sce; sce= sce->id.next)
- sce->r.renderer= 0;
-
- }
// correct introduce of seed for wind force
if (main->versionfile < 249 && main->subversionfile < 1) {
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2011-12-04
16:07:50 UTC (rev 42407)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2011-12-04
16:22:53 UTC (rev 42408)
@@ -1259,9 +1259,7 @@
{
Scene *scene= CTX_data_scene(C);
- if(scene->r.renderer!=R_INTERN) {
- BKE_report(reports, RPT_ERROR, "Bake only supported for
Internal Renderer");
- } else if((scene->r.bake_flag & R_BAKE_TO_ACTIVE) &&
CTX_data_active_object(C)==NULL) {
+ if((scene->r.bake_flag & R_BAKE_TO_ACTIVE) &&
CTX_data_active_object(C)==NULL) {
BKE_report(reports, RPT_ERROR, "No active object");
}
else if(scene->r.bake_mode==RE_BAKE_AO && scene->world==NULL) {
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-12-04
16:07:50 UTC (rev 42407)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-12-04
16:22:53 UTC (rev 42408)
@@ -389,8 +389,7 @@
*/
short raytrace_structure;
- /* renderer (deprecated) */
- short renderer DNA_DEPRECATED;
+ short pad1;
/* octree resolution */
short ocres;
@@ -1036,10 +1035,6 @@
#define R_FILTER_MITCH 6
#define R_FILTER_FAST_GAUSS 7 /* note, this is only used for nodes at the
moment */
-/* yafray: renderer flag (not only exclusive to yafray) */
-#define R_INTERN 0
-#define R_YAFRAY 1
-
/* raytrace structure */
#define R_RAYSTRUCTURE_AUTO 0
#define R_RAYSTRUCTURE_OCTREE 1
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2011-12-04 16:07:50 UTC (rev 42407)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2011-12-04 16:22:53 UTC (rev 42408)
@@ -1718,7 +1718,7 @@
sd.adapt_angle =
cosf(DEG2RADF((float)part->adapt_angle));
}
- if(re->r.renderer==R_INTERN && part->draw&PART_DRAW_REN_STRAND)
{
+ if (part->draw & PART_DRAW_REN_STRAND) {
strandbuf= RE_addStrandBuffer(obr,
(totpart+totchild)*(path_nbr+1));
strandbuf->ma= ma;
strandbuf->lay= ob->lay;
@@ -3872,8 +3872,9 @@
}
}
}
- /* yafray: shadow flag should not be cleared, only used with internal
renderer */
- if (re->r.renderer==R_INTERN) {
+
+ /* old code checked for internal render (aka not yafray) */
+ {
/* to make sure we can check ray shadow easily in the render
code */
if(lar->mode & LA_SHAD_RAY) {
if( (re->r.mode & R_RAYTRACE)==0)
@@ -5109,10 +5110,9 @@
/* SHADOW BUFFER */
threaded_makeshadowbufs(re);
-
- /* yafray: 'direct' radiosity, environment maps and raytree
init not needed for yafray render */
- /* although radio mode could be useful at some point, later */
- if (re->r.renderer==R_INTERN) {
+
+ /* old code checked for internal render (aka not yafray) */
+ {
/* raytree */
if(!re->test_break(re->tbh)) {
if(re->r.mode & R_RAYTRACE) {
@@ -5137,14 +5137,12 @@
/* Occlusion */
if((re->wrld.mode &
(WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) && !re->test_break(re->tbh))
if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX)
- if(re->r.renderer==R_INTERN)
- if(re->r.mode & R_SHADOW)
- make_occ_tree(re);
+ if(re->r.mode & R_SHADOW)
+ make_occ_tree(re);
/* SSS */
if((re->r.mode & R_SSS) && !re->test_break(re->tbh))
- if(re->r.renderer==R_INTERN)
- make_sss_tree(re);
+ make_sss_tree(re);
if(!re->test_break(re->tbh))
if(re->r.mode & R_RAYTRACE)
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2011-12-04 16:07:50 UTC (rev 42407)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2011-12-04 16:22:53 UTC (rev 42408)
@@ -2832,12 +2832,6 @@
BKE_report(reports, RPT_ERROR, "All RenderLayers are disabled");
return 0;
}
-
- /* renderer */
- if(!ELEM(scene->r.renderer, R_INTERN, R_YAFRAY)) {
- BKE_report(reports, RPT_ERROR, "Unknown render engine set");
- return 0;
- }
return 1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
