[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27443] trunk/blender/source/blender: Fix for warning introduced in passes commit, also removed some more
Brecht Van Lommel
brecht at blender.org
Fri Mar 12 14:19:32 CET 2010
Revision: 27443
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27443
Author: blendix
Date: 2010-03-12 14:19:32 +0100 (Fri, 12 Mar 2010)
Log Message:
-----------
Fix for warning introduced in passes commit, also removed some more
radiosity code.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c 2010-03-12 13:11:23 UTC (rev 27442)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c 2010-03-12 13:19:32 UTC (rev 27443)
@@ -443,7 +443,7 @@
/* Prototype, see functions below */
static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv,
- TreeElement *parent, short type, short index);
+ TreeElement *parent, short type, int index);
static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl)
@@ -564,7 +564,7 @@
}
static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv,
- TreeElement *parent, short type, short index)
+ TreeElement *parent, short type, int index)
{
TreeElement *te;
TreeStoreElem *tselem;
@@ -1234,7 +1234,7 @@
return(1);
}
-void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, short index)
+void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, int index)
{
TreeElement *ch;
Sequence *p;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_intern.h 2010-03-12 13:11:23 UTC (rev 27442)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_intern.h 2010-03-12 13:19:32 UTC (rev 27443)
@@ -45,7 +45,8 @@
ListBase subtree;
float xs, ys; // do selection
int store_index; // offset in tree store
- short flag, index; // flag for non-saved stuff, index for data arrays
+ short flag; // flag for non-saved stuff
+ int index; // index for data arrays
short idcode; // from TreeStore id
short xend; // width of item display, for select
char *name;
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2010-03-12 13:11:23 UTC (rev 27442)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2010-03-12 13:19:32 UTC (rev 27443)
@@ -4674,8 +4674,7 @@
/* don't allow lamp, animated duplis, or radio render */
return (render_object_type(obd->type) &&
- (!(dob->type == OB_DUPLIGROUP) || !dob->animated) &&
- !(re->r.mode & R_RADIO));
+ (!(dob->type == OB_DUPLIGROUP) || !dob->animated));
}
static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, int level, int enable)
@@ -5027,11 +5026,6 @@
/* 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) {
-#if 0 /* RADIO was removed */
- /* RADIO (uses no R anymore) */
- if(!re->test_break(re->tbh))
- if(re->r.mode & R_RADIO) do_radio_render(re);
-#endif
/* raytree */
if(!re->test_break(re->tbh)) {
if(re->r.mode & R_RAYTRACE) {
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c 2010-03-12 13:11:23 UTC (rev 27442)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c 2010-03-12 13:19:32 UTC (rev 27443)
@@ -1773,13 +1773,6 @@
shr->combined[0]+= shi->ambr;
shr->combined[1]+= shi->ambg;
shr->combined[2]+= shi->ambb;
-
- /* removed
- if(shi->combinedflag & SCE_PASS_RADIO) {
- shr->combined[0]+= shi->r*shi->amb*shi->rad[0];
- shr->combined[1]+= shi->g*shi->amb*shi->rad[1];
- shr->combined[2]+= shi->b*shi->amb*shi->rad[2];
- }*/
if(ma->mode & MA_RAMP_COL) ramp_diffuse_result(shr->combined, shi);
}
More information about the Bf-blender-cvs
mailing list