griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

soc-2008-mxcurioni: merged changes to revision 16795 (repaired)

Browse Source
This commit is contained in:
Maxime Curioni
2008-09-28 20:15:52 +00:00
parent bb8477ec57 c3794cb983
commit efd969dc61
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/scene.c
View File

@@ -272,7 +272,6 @@ Scene *add_scene(char *name)
strcpy(sce->r.backbuf, "//backbuf");
strcpy(sce->r.pic, U.renderdir);
BLI_init_rctf(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f);
sce->r.osa= 8;

3
source/blender/include/butspace.h
View File

@@ -315,8 +315,6 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
#define B_FS_PIC 1601
#define B_FS_BACKBUF 1602
#define B_FS_FRS 1603
#define B_FS_FTYPE 1604 /* FTYPE is no more */
#define B_DORENDER 1605
#define B_DOANIM 1606
@@ -371,7 +369,6 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
#define B_SEQ_BUT_RELOAD_FILE 1696
#define B_SEQ_BUT_REBUILD_PROXY 1697
#define B_SEQ_SEL_PROXY_DIR 1698
/* *********************** */
#define B_ARMATUREBUTS 1800
#define B_POSE 1701

2
source/blender/src/keyframing.c
View File

@@ -1744,7 +1744,7 @@ void common_modifykey (short mode)
if (achan && achan->ipo)
icu= achan->ipo->curve.first;
}
else
else if(cks->ipo)
icu= cks->ipo->curve.first;
/* we get adrcodes directly from IPO curves (see method below...) */

2
source/blender/yafray/SConscript
View File

@@ -6,4 +6,4 @@ sources = env.Glob('intern/*.cpp')
incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include'
env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )