kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

svn merge -r41431:41453 ^/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton 2011-11-01 23:24:51 +00:00
commit 9be43762bc
39 changed files with 71 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_files/cmake/cmake_consistency_check_config.py
View File

@ -29,8 +29,8 @@ IGNORE = (
"source/blender/imbuf/intern/imbuf_cocoa.m", "source/blender/imbuf/intern/imbuf_cocoa.m",
"extern/recastnavigation/Recast/Source/RecastLog.cpp", "extern/recastnavigation/Recast/Source/RecastLog.cpp",
"extern/recastnavigation/Recast/Source/RecastTimer.cpp", "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
"entern/audaspace/SRC/AUD_SRCResampleFactory.cpp", "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
"entern/audaspace/SRC/AUD_SRCResampleReader.cpp", "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h", "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h", "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@ -45,6 +45,10 @@ IGNORE = (
"extern/eltopo/common/meshes/TriangleIndex.hpp", "extern/eltopo/common/meshes/TriangleIndex.hpp",
"extern/eltopo/common/meshes/meshloader.h", "extern/eltopo/common/meshes/meshloader.h",
"extern/eltopo/eltopo3d/broadphase_blenderbvh.h", "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
"extern/recastnavigation/Recast/Include/RecastLog.h",
"extern/recastnavigation/Recast/Include/RecastTimer.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
"intern/audaspace/SRC/AUD_SRCResampleReader.h",
# for bmesh branch only # for bmesh branch only
"source/blender/bmesh/editmesh_tools.c", "source/blender/bmesh/editmesh_tools.c",
@ -54,10 +58,6 @@ IGNORE = (
"source/blender/bmesh/tools/BME_duplicate.c", "source/blender/bmesh/tools/BME_duplicate.c",
"source/blender/bmesh/tools/BME_extrude.c", "source/blender/bmesh/tools/BME_extrude.c",
"source/blender/bmesh/tools/BME_weld.c", "source/blender/bmesh/tools/BME_weld.c",
"extern/recastnavigation/Recast/Include/RecastLog.h",
"extern/recastnavigation/Recast/Include/RecastTimer.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
"intern/audaspace/SRC/AUD_SRCResampleReader.h",
) )
UTF8_CHECK = True UTF8_CHECK = True

2
release/scripts/startup/bl_operators/image.py
View File

@ -192,6 +192,8 @@ class ProjectEdit(Operator):
image_new.file_format = 'PNG' image_new.file_format = 'PNG'
image_new.save() image_new.save()
filepath_final = bpy.path.abspath(filepath_final)
try: try:
bpy.ops.image.external_edit(filepath=filepath_final) bpy.ops.image.external_edit(filepath=filepath_final)
except RuntimeError as re: except RuntimeError as re:

2
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -209,7 +209,7 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
col.operator("transform.resize", text="Scale") col.operator("transform.resize", text="Scale")
col = layout.column(align=True) col = layout.column(align=True)
col.operator("transform.transform", text="Tilt").mode = 'TILT' col.operator("transform.tilt", text="Tilt")
col.operator("transform.transform", text="Shrink/Fatten").mode = 'CURVE_SHRINKFATTEN' col.operator("transform.transform", text="Shrink/Fatten").mode = 'CURVE_SHRINKFATTEN'
col = layout.column(align=True) col = layout.column(align=True)

2
source/blender/blenfont/intern/blf_lang.c
View File

@ -120,7 +120,7 @@ void BLF_lang_set(const char *str)
const char *short_locale; const char *short_locale;
int ok= 1; int ok= 1;
#if defined (_WIN32) && !defined(FREE_WINDOWS) #if defined (_WIN32) && !defined(FREE_WINDOWS)
char *long_locale = locales[ 2 * U.language]; const char *long_locale = locales[ 2 * U.language];
#endif #endif
if((U.transopts&USER_DOTRANSLATE)==0) if((U.transopts&USER_DOTRANSLATE)==0)

7
source/blender/blenkernel/intern/smoke.c
View File

@ -77,6 +77,8 @@
#include "BKE_smoke.h" #include "BKE_smoke.h"
#ifdef WITH_SMOKE
#ifdef _WIN32 #ifdef _WIN32
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
@ -131,12 +133,13 @@ struct SmokeModifierData;
#define TRI_UVOFFSET (1./4.) #define TRI_UVOFFSET (1./4.)
#ifdef WITH_SMOKE
/* forward declerations */ /* forward declerations */
static void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len); static void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *tris, int numfaces, int numtris, int **tridivs, float cell_len);
static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct); static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int correct);
static void fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings *scs); static void fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings *scs);
#else /* WITH_SMOKE */ #else /* WITH_SMOKE */
/* Stubs to use when smoke is disabled */ /* Stubs to use when smoke is disabled */
struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype)) { return NULL; } struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype)) { return NULL; }
struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(p0)) { return NULL; } struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(p0)) { return NULL; }
@ -146,9 +149,11 @@ void smoke_initWaveletBlenderRNA(struct WTURBULENCE *UNUSED(wt), float *UNUSED(s
void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), int *UNUSED(border_colli)) {} void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), int *UNUSED(border_colli)) {}
long long smoke_get_mem_req(int UNUSED(xres), int UNUSED(yres), int UNUSED(zres), int UNUSED(amplify)) { return 0; } long long smoke_get_mem_req(int UNUSED(xres), int UNUSED(yres), int UNUSED(zres), int UNUSED(amplify)) { return 0; }
void smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) {} void smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) {}
#endif /* WITH_SMOKE */ #endif /* WITH_SMOKE */
#ifdef WITH_SMOKE #ifdef WITH_SMOKE
static int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, DerivedMesh *dm) static int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, DerivedMesh *dm)
{ {
if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain && !smd->domain->fluid) if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain && !smd->domain->fluid)

1
source/blender/blenloader/BLO_readfile.h
View File

@ -44,7 +44,6 @@ struct MemFile;
struct ReportList; struct ReportList;
struct Scene; struct Scene;
struct SpaceFile; struct SpaceFile;
struct SpaceImaSel;
struct UserDef; struct UserDef;
struct bContext; struct bContext;
struct BHead; struct BHead;

91
source/blender/blenloader/intern/readfile.c
View File

@ -4993,15 +4993,6 @@ static void lib_link_screen(FileData *fd, Main *main)
sfile->folders_prev= NULL; sfile->folders_prev= NULL;
sfile->folders_next= NULL; sfile->folders_next= NULL;
} }
else if(sl->spacetype==SPACE_IMASEL) {
SpaceImaSel *simasel= (SpaceImaSel *)sl;
simasel->files = NULL;
simasel->returnfunc= NULL;
simasel->menup= NULL;
simasel->pupmenu= NULL;
simasel->img= NULL;
}
else if(sl->spacetype==SPACE_ACTION) { else if(sl->spacetype==SPACE_ACTION) {
SpaceAction *saction= (SpaceAction *)sl; SpaceAction *saction= (SpaceAction *)sl;
bDopeSheet *ads= &saction->ads; bDopeSheet *ads= &saction->ads;
@ -5065,11 +5056,6 @@ static void lib_link_screen(FileData *fd, Main *main)
} }
} }
} }
else if(sl->spacetype==SPACE_SOUND) {
SpaceSound *ssound= (SpaceSound *)sl;
ssound->sound= newlibadr_us(fd, sc->id.lib, ssound->sound);
}
else if(sl->spacetype==SPACE_NODE) { else if(sl->spacetype==SPACE_NODE) {
SpaceNode *snode= (SpaceNode *)sl; SpaceNode *snode= (SpaceNode *)sl;
@ -5226,12 +5212,6 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene)
SpaceFile *sfile= (SpaceFile *)sl; SpaceFile *sfile= (SpaceFile *)sl;
sfile->op= NULL; sfile->op= NULL;
} }
else if(sl->spacetype==SPACE_IMASEL) {
SpaceImaSel *simasel= (SpaceImaSel *)sl;
if (simasel->files) {
//XXX BIF_filelist_freelib(simasel->files);
}
}
else if(sl->spacetype==SPACE_ACTION) { else if(sl->spacetype==SPACE_ACTION) {
SpaceAction *saction= (SpaceAction *)sl; SpaceAction *saction= (SpaceAction *)sl;
@ -5298,11 +5278,6 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene)
} }
} }
} }
else if(sl->spacetype==SPACE_SOUND) {
SpaceSound *ssound= (SpaceSound *)sl;
ssound->sound= restore_pointer_by_name(newmain, (ID *)ssound->sound, 1);
}
else if(sl->spacetype==SPACE_NODE) { else if(sl->spacetype==SPACE_NODE) {
SpaceNode *snode= (SpaceNode *)sl; SpaceNode *snode= (SpaceNode *)sl;
@ -6690,16 +6665,6 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
//ar->v2d.flag |= V2D_IS_INITIALISED; //ar->v2d.flag |= V2D_IS_INITIALISED;
break; break;
} }
case SPACE_SOUND:
{
SpaceSound *ssound= (SpaceSound *)sl;
memcpy(&ar->v2d, &ssound->v2d, sizeof(View2D));
ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
ar->v2d.scroll |= (V2D_SCROLL_LEFT);
//ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_NLA: case SPACE_NLA:
{ {
SpaceNla *snla= (SpaceNla *)sl; SpaceNla *snla= (SpaceNla *)sl;
@ -6815,11 +6780,17 @@ static void do_versions_windowmanager_2_50(bScreen *screen)
area_add_window_regions(sa, sa->spacedata.first, &sa->regionbase); area_add_window_regions(sa, sa->spacedata.first, &sa->regionbase);
/* space imageselect is depricated */ /* space imageselect is deprecated */
for(sl= sa->spacedata.first; sl; sl= sl->next) { for(sl= sa->spacedata.first; sl; sl= sl->next) {
if(sl->spacetype==SPACE_IMASEL) if(sl->spacetype==SPACE_IMASEL)
sl->spacetype= SPACE_INFO; /* spacedata then matches */ sl->spacetype= SPACE_EMPTY; /* spacedata then matches */
} }
/* space sound is deprecated */
for(sl= sa->spacedata.first; sl; sl= sl->next) {
if(sl->spacetype==SPACE_SOUND)
sl->spacetype= SPACE_EMPTY; /* spacedata then matches */
}
/* it seems to be possible in 2.5 to have this saved, filewindow probably */ /* it seems to be possible in 2.5 to have this saved, filewindow probably */
sa->butspacetype= sa->spacetype; sa->butspacetype= sa->spacetype;
@ -9219,7 +9190,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
} }
if(main->versionfile <= 245) { if(main->versionfile <= 245) {
Scene *sce; Scene *sce;
bScreen *sc;
Object *ob; Object *ob;
Image *ima; Image *ima;
Lamp *la; Lamp *la;
@ -9309,49 +9279,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for(ima= main->image.first; ima; ima= ima->id.next) { for(ima= main->image.first; ima; ima= ima->id.next) {
ima->preview = NULL; ima->preview = NULL;
} }
/* repair imasel space - completely reworked */
for(sc= main->screen.first; sc; sc= sc->id.next) {
ScrArea *sa;
sa= sc->areabase.first;
while(sa) {
SpaceLink *sl;
for (sl= sa->spacedata.first; sl; sl= sl->next) {
if(sl->spacetype==SPACE_IMASEL) {
SpaceImaSel *simasel= (SpaceImaSel*) sl;
simasel->blockscale= 0.7f;
/* view 2D */
simasel->v2d.tot.xmin= -10.0f;
simasel->v2d.tot.ymin= -10.0f;
simasel->v2d.tot.xmax= (float)sa->winx + 10.0f;
simasel->v2d.tot.ymax= (float)sa->winy + 10.0f;
simasel->v2d.cur.xmin= 0.0f;
simasel->v2d.cur.ymin= 0.0f;
simasel->v2d.cur.xmax= (float)sa->winx;
simasel->v2d.cur.ymax= (float)sa->winy;
simasel->v2d.min[0]= 1.0;
simasel->v2d.min[1]= 1.0;
simasel->v2d.max[0]= 32000.0f;
simasel->v2d.max[1]= 32000.0f;
simasel->v2d.minzoom= 0.5f;
simasel->v2d.maxzoom= 1.21f;
simasel->v2d.scroll= 0;
simasel->v2d.keepzoom= V2D_LIMITZOOM|V2D_KEEPASPECT;
simasel->v2d.keeptot= 0;
simasel->prv_h = 96;
simasel->prv_w = 96;
simasel->flag = 7; /* ??? elubie */
BLI_strncpy (simasel->dir, U.textudir, sizeof(simasel->dir)); /* TON */
simasel->file[0]= '\0';
simasel->returnfunc = NULL;
simasel->title[0] = 0;
}
}
sa = sa->next;
}
}
} }
/* add point caches */ /* add point caches */

7
source/blender/blenloader/intern/writefile.c
View File

@ -2208,10 +2208,6 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
if(sima->cumap) if(sima->cumap)
write_curvemapping(wd, sima->cumap); write_curvemapping(wd, sima->cumap);
} }
else if(sl->spacetype==SPACE_IMASEL) {
// XXX: depreceated... do we still want to keep this?
writestruct(wd, DATA, "SpaceImaSel", 1, sl);
}
else if(sl->spacetype==SPACE_TEXT) { else if(sl->spacetype==SPACE_TEXT) {
writestruct(wd, DATA, "SpaceText", 1, sl); writestruct(wd, DATA, "SpaceText", 1, sl);
} }
@ -2223,9 +2219,6 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
else if(sl->spacetype==SPACE_ACTION) { else if(sl->spacetype==SPACE_ACTION) {
writestruct(wd, DATA, "SpaceAction", 1, sl); writestruct(wd, DATA, "SpaceAction", 1, sl);
} }
else if(sl->spacetype==SPACE_SOUND) {
writestruct(wd, DATA, "SpaceSound", 1, sl);
}
else if(sl->spacetype==SPACE_NLA){ else if(sl->spacetype==SPACE_NLA){
SpaceNla *snla= (SpaceNla *)sl; SpaceNla *snla= (SpaceNla *)sl;

1
source/blender/editors/CMakeLists.txt
View File

@ -46,7 +46,6 @@ if(WITH_BLENDER)
add_subdirectory(space_outliner) add_subdirectory(space_outliner)
add_subdirectory(space_script) add_subdirectory(space_script)
add_subdirectory(space_sequencer) add_subdirectory(space_sequencer)
add_subdirectory(space_sound)
add_subdirectory(space_text) add_subdirectory(space_text)
add_subdirectory(space_time) add_subdirectory(space_time)
add_subdirectory(space_userpref) add_subdirectory(space_userpref)

1
source/blender/editors/SConscript
View File

@ -25,7 +25,6 @@ SConscript(['datafiles/SConscript',
'space_outliner/SConscript', 'space_outliner/SConscript',
'space_time/SConscript', 'space_time/SConscript',
'space_view3d/SConscript', 'space_view3d/SConscript',
'space_sound/SConscript',
'space_action/SConscript', 'space_action/SConscript',
'space_nla/SConscript', 'space_nla/SConscript',
'space_script/SConscript', 'space_script/SConscript',

6
source/blender/editors/animation/anim_markers.c
View File

@ -777,7 +777,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
fac= ((float)(evt->x - mm->firstx)*dx); fac= ((float)(evt->x - mm->firstx)*dx);
if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) if (mm->slink->spacetype == SPACE_TIME)
apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0); apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0);
else else
apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/); apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
@ -796,7 +796,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
if (totmark==1) { if (totmark==1) {
/* we print current marker value */ /* we print current marker value */
if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) { if (mm->slink->spacetype == SPACE_TIME) {
SpaceTime *stime= (SpaceTime *)mm->slink; SpaceTime *stime= (SpaceTime *)mm->slink;
if (stime->flag & TIME_DRAWFRAMES) if (stime->flag & TIME_DRAWFRAMES)
BLI_snprintf(str, sizeof(str), "Marker %d offset %d", selmarker->frame, offs); BLI_snprintf(str, sizeof(str), "Marker %d offset %d", selmarker->frame, offs);
@ -816,7 +816,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
} }
else { else {
/* we only print the offset */ /* we only print the offset */
if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) { if (mm->slink->spacetype == SPACE_TIME) {
SpaceTime *stime= (SpaceTime *)mm->slink; SpaceTime *stime= (SpaceTime *)mm->slink;
if (stime->flag & TIME_DRAWFRAMES) if (stime->flag & TIME_DRAWFRAMES)
BLI_snprintf(str, sizeof(str), "Marker offset %d ", offs); BLI_snprintf(str, sizeof(str), "Marker offset %d ", offs);

1
source/blender/editors/curve/curve_ops.c
View File

@ -223,7 +223,6 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "CURVE_OT_tilt_clear", TKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "TRANSFORM_OT_tilt", TKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "TRANSFORM_OT_tilt", TKEY, KM_PRESS, KM_CTRL, 0);
RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", TKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", TFM_TILT);
RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", TFM_CURVE_SHRINKFATTEN); RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", TFM_CURVE_SHRINKFATTEN);

1
source/blender/editors/include/ED_screen.h
View File

@ -159,6 +159,7 @@ int ED_operator_editmesh_view3d(struct bContext *C);
int ED_operator_editmesh_region_view3d(struct bContext *C); int ED_operator_editmesh_region_view3d(struct bContext *C);
int ED_operator_editarmature(struct bContext *C); int ED_operator_editarmature(struct bContext *C);
int ED_operator_editcurve(struct bContext *C); int ED_operator_editcurve(struct bContext *C);
int ED_operator_editcurve_3d(struct bContext *C);
int ED_operator_editsurf(struct bContext *C); int ED_operator_editsurf(struct bContext *C);
int ED_operator_editsurfcurve(struct bContext *C); int ED_operator_editsurfcurve(struct bContext *C);
int ED_operator_editsurfcurve_region_view3d(struct bContext *C); int ED_operator_editsurfcurve_region_view3d(struct bContext *C);

1
source/blender/editors/include/ED_space_api.h
View File

@ -46,7 +46,6 @@ void ED_spacetype_node(void);
void ED_spacetype_buttons(void); void ED_spacetype_buttons(void);
void ED_spacetype_info(void); void ED_spacetype_info(void);
void ED_spacetype_file(void); void ED_spacetype_file(void);
void ED_spacetype_sound(void);
void ED_spacetype_action(void); void ED_spacetype_action(void);
void ED_spacetype_nla(void); void ED_spacetype_nla(void);
void ED_spacetype_script(void); void ED_spacetype_script(void);

41
source/blender/editors/interface/resources.c
View File

@ -129,18 +129,12 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
case SPACE_IMAGE: case SPACE_IMAGE:
ts= &btheme->tima; ts= &btheme->tima;
break; break;
case SPACE_IMASEL:
ts= &btheme->timasel;
break;
case SPACE_TEXT: case SPACE_TEXT:
ts= &btheme->text; ts= &btheme->text;
break; break;
case SPACE_OUTLINER: case SPACE_OUTLINER:
ts= &btheme->toops; ts= &btheme->toops;
break; break;
case SPACE_SOUND:
ts= &btheme->tsnd;
break;
case SPACE_INFO: case SPACE_INFO:
ts= &btheme->tinfo; ts= &btheme->tinfo;
break; break;
@ -528,12 +522,10 @@ static void ui_theme_init_new(bTheme *btheme)
ui_theme_init_new_do(&btheme->tfile); ui_theme_init_new_do(&btheme->tfile);
ui_theme_init_new_do(&btheme->tipo); ui_theme_init_new_do(&btheme->tipo);
ui_theme_init_new_do(&btheme->tinfo); ui_theme_init_new_do(&btheme->tinfo);
ui_theme_init_new_do(&btheme->tsnd);
ui_theme_init_new_do(&btheme->tact); ui_theme_init_new_do(&btheme->tact);
ui_theme_init_new_do(&btheme->tnla); ui_theme_init_new_do(&btheme->tnla);
ui_theme_init_new_do(&btheme->tseq); ui_theme_init_new_do(&btheme->tseq);
ui_theme_init_new_do(&btheme->tima); ui_theme_init_new_do(&btheme->tima);
ui_theme_init_new_do(&btheme->timasel);
ui_theme_init_new_do(&btheme->text); ui_theme_init_new_do(&btheme->text);
ui_theme_init_new_do(&btheme->toops); ui_theme_init_new_do(&btheme->toops);
ui_theme_init_new_do(&btheme->ttime); ui_theme_init_new_do(&btheme->ttime);
@ -731,18 +723,6 @@ void ui_theme_init_default(void)
SETCOL(btheme->tima.editmesh_active, 255, 255, 255, 128); SETCOL(btheme->tima.editmesh_active, 255, 255, 255, 128);
SETCOLF(btheme->tima.preview_back, 0.45, 0.45, 0.45, 1.0); SETCOLF(btheme->tima.preview_back, 0.45, 0.45, 0.45, 1.0);
/* space imageselect */
btheme->timasel= btheme->tv3d;
SETCOL(btheme->timasel.active, 195, 195, 195, 255); /* active tile */
SETCOL(btheme->timasel.grid, 94, 94, 94, 255); /* active file text */
SETCOL(btheme->timasel.back, 110, 110, 110, 255);
SETCOL(btheme->timasel.shade1, 94, 94, 94, 255); /* bar */
SETCOL(btheme->timasel.shade2, 172, 172, 172, 255); /* sliders */
SETCOL(btheme->timasel.hilite, 17, 27, 60, 100); /* selected tile */
SETCOL(btheme->timasel.text, 0, 0, 0, 255);
SETCOL(btheme->timasel.text_hi, 255, 255, 255, 255);
SETCOL(btheme->timasel.panel, 132, 132, 132, 255);
/* space text */ /* space text */
btheme->text= btheme->tv3d; btheme->text= btheme->tv3d;
SETCOL(btheme->text.back, 153, 153, 153, 255); SETCOL(btheme->text.back, 153, 153, 153, 255);
@ -778,15 +758,11 @@ void ui_theme_init_default(void)
SETCOL(btheme->tconsole.console_error, 220, 96, 96, 255); SETCOL(btheme->tconsole.console_error, 220, 96, 96, 255);
SETCOL(btheme->tconsole.console_cursor, 220, 96, 96, 255); SETCOL(btheme->tconsole.console_cursor, 220, 96, 96, 255);
/* space sound */
btheme->tsnd= btheme->tv3d;
SETCOLF(btheme->tsnd.back, 0.45, 0.45, 0.45, 1.0);
SETCOLF(btheme->tsnd.grid, 0.36, 0.36, 0.36, 1.0);
SETCOL(btheme->tsnd.shade1, 173, 173, 173, 255); // sliders
/* space time */ /* space time */
btheme->ttime= btheme->tsnd; // same as sound space btheme->ttime= btheme->tv3d;
SETCOLF(btheme->ttime.back, 0.45, 0.45, 0.45, 1.0);
SETCOLF(btheme->ttime.grid, 0.36, 0.36, 0.36, 1.0);
SETCOL(btheme->ttime.shade1, 173, 173, 173, 255); // sliders
/* space node, re-uses syntax color storage */ /* space node, re-uses syntax color storage */
btheme->tnode= btheme->tv3d; btheme->tnode= btheme->tv3d;
@ -801,7 +777,6 @@ void ui_theme_init_default(void)
/* space logic */ /* space logic */
btheme->tlogic= btheme->tv3d; btheme->tlogic= btheme->tv3d;
SETCOL(btheme->tlogic.back, 100, 100, 100, 255); SETCOL(btheme->tlogic.back, 100, 100, 100, 255);
} }
@ -1193,7 +1168,11 @@ void init_userdef_do_versions(void)
for(btheme= U.themes.first; btheme; btheme= btheme->next) { for(btheme= U.themes.first; btheme; btheme= btheme->next) {
/* check for alpha==0 is safe, then color was never set */ /* check for alpha==0 is safe, then color was never set */
if(btheme->ttime.back[3]==0) { if(btheme->ttime.back[3]==0) {
btheme->ttime = btheme->tsnd; // copy from sound // copied from ui_theme_init_default
btheme->ttime= btheme->tv3d;
SETCOLF(btheme->ttime.back, 0.45, 0.45, 0.45, 1.0);
SETCOLF(btheme->ttime.grid, 0.36, 0.36, 0.36, 1.0);
SETCOL(btheme->ttime.shade1, 173, 173, 173, 255); // sliders
} }
if(btheme->text.syntaxn[3]==0) { if(btheme->text.syntaxn[3]==0) {
SETCOL(btheme->text.syntaxn, 0, 0, 200, 255); /* Numbers Blue*/ SETCOL(btheme->text.syntaxn, 0, 0, 200, 255); /* Numbers Blue*/
@ -1320,7 +1299,7 @@ void init_userdef_do_versions(void)
SETCOL(btheme->tact.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->tact.cframe, 0x60, 0xc0, 0x40, 255);
SETCOL(btheme->tnla.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->tnla.cframe, 0x60, 0xc0, 0x40, 255);
SETCOL(btheme->tseq.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->tseq.cframe, 0x60, 0xc0, 0x40, 255);
SETCOL(btheme->tsnd.cframe, 0x60, 0xc0, 0x40, 255); //SETCOL(btheme->tsnd.cframe, 0x60, 0xc0, 0x40, 255); Not needed anymore
SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255);
} }
} }

13
source/blender/editors/render/render_internal.c
View File

@ -223,20 +223,26 @@ static int screen_render_exec(bContext *C, wmOperator *op)
{ {
Scene *scene= CTX_data_scene(C); Scene *scene= CTX_data_scene(C);
SceneRenderLayer *srl= NULL; SceneRenderLayer *srl= NULL;
Render *re= RE_NewRender(scene->id.name); Render *re;
Image *ima; Image *ima;
View3D *v3d= CTX_wm_view3d(C); View3D *v3d= CTX_wm_view3d(C);
Main *mainp= CTX_data_main(C); Main *mainp= CTX_data_main(C);
unsigned int lay= (v3d)? v3d->lay: scene->lay; unsigned int lay;
const short is_animation= RNA_boolean_get(op->ptr, "animation"); const short is_animation= RNA_boolean_get(op->ptr, "animation");
const short is_write_still= RNA_boolean_get(op->ptr, "write_still"); const short is_write_still= RNA_boolean_get(op->ptr, "write_still");
struct Object *camera_override= v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; struct Object *camera_override= v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
/* custom scene and single layer re-render */
screen_render_scene_layer_set(op, mainp, &scene, &srl);
if(!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.imtype)) { if(!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.imtype)) {
BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected"); BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
re= RE_NewRender(scene->id.name);
lay= (v3d)? v3d->lay: scene->lay;
G.afbreek= 0; G.afbreek= 0;
RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break); RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
@ -252,9 +258,6 @@ static int screen_render_exec(bContext *C, wmOperator *op)
RE_SetReports(re, op->reports); RE_SetReports(re, op->reports);
/* custom scene and single layer re-render */
screen_render_scene_layer_set(op, mainp, &scene, &srl);
if(is_animation) if(is_animation)
RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step); RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step);
else else

13
source/blender/editors/screen/screen_ops.c
View File

@ -193,7 +193,7 @@ int ED_operator_animview_active(bContext *C)
{ {
if(ED_operator_areaactive(C)) { if(ED_operator_areaactive(C)) {
SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C); SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C);
if (sl && (ELEM6(sl->spacetype, SPACE_SEQ, SPACE_SOUND, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME))) if (sl && (ELEM5(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME)))
return TRUE; return TRUE;
} }
@ -404,6 +404,17 @@ int ED_operator_editcurve(bContext *C)
return 0; return 0;
} }
int ED_operator_editcurve_3d(bContext *C)
{
Object *obedit= CTX_data_edit_object(C);
if(obedit && obedit->type==OB_CURVE) {
Curve *cu= (Curve *)obedit->data;
return (cu->flag&CU_3D) && (NULL != cu->editnurb);
}
return 0;
}
int ED_operator_editsurf(bContext *C) int ED_operator_editsurf(bContext *C)
{ {
Object *obedit= CTX_data_edit_object(C); Object *obedit= CTX_data_edit_object(C);

1
source/blender/editors/space_api/spacetypes.c
View File

@ -83,7 +83,6 @@ void ED_spacetypes_init(void)
ED_spacetype_buttons(); ED_spacetype_buttons();
ED_spacetype_info(); ED_spacetype_info();
ED_spacetype_file(); ED_spacetype_file();
ED_spacetype_sound();
ED_spacetype_action(); ED_spacetype_action();
ED_spacetype_nla(); ED_spacetype_nla();
ED_spacetype_script(); ED_spacetype_script();

4
source/blender/editors/space_graph/graph_intern.h
View File

@ -56,10 +56,6 @@ void graph_draw_channel_names(struct bContext *C, struct bAnimContext *ac, struc
void graph_draw_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar, struct View2DGrid *grid, short sel); void graph_draw_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar, struct View2DGrid *grid, short sel);
void graph_draw_ghost_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar); void graph_draw_ghost_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar);
/* ***************************************** */
/* graph_header.c */
void graph_header_buttons(const bContext *C, struct ARegion *ar);
/* ***************************************** */ /* ***************************************** */
/* graph_select.c */ /* graph_select.c */

3
source/blender/editors/space_image/image_intern.h
View File

@ -51,9 +51,6 @@ struct ARegion *image_has_scope_region(struct ScrArea *sa);
extern const char *image_context_dir[]; /* doc access */ extern const char *image_context_dir[]; /* doc access */
/* image_header.c */
void image_header_buttons(const struct bContext *C, struct ARegion *ar);
void IMAGE_OT_toolbox(struct wmOperatorType *ot); void IMAGE_OT_toolbox(struct wmOperatorType *ot);
/* image_draw.c */ /* image_draw.c */

5
source/blender/editors/space_nla/nla_intern.h
View File

@ -50,11 +50,6 @@ void NLA_OT_properties(wmOperatorType *ot);
void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar); void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar);
void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar); void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar);
/* **************************************** */
/* nla_header.c */
void nla_header_buttons(const bContext *C, ARegion *ar);
/* **************************************** */ /* **************************************** */
/* nla_select.c */ /* nla_select.c */

3
source/blender/editors/space_outliner/outliner_intern.h
View File

@ -229,7 +229,4 @@ void OUTLINER_OT_action_set(struct wmOperatorType *ot);
void outliner_operatortypes(void); void outliner_operatortypes(void);
void outliner_keymap(struct wmKeyConfig *keyconf); void outliner_keymap(struct wmKeyConfig *keyconf);
/* outliner_header.c */
void outliner_header_buttons(const struct bContext *C, struct ARegion *ar);
#endif /* ED_OUTLINER_INTERN_H */ #endif /* ED_OUTLINER_INTERN_H */

1
source/blender/editors/space_script/CMakeLists.txt
View File

@ -35,7 +35,6 @@ set(INC_SYS
set(SRC set(SRC
script_edit.c script_edit.c
script_header.c
script_ops.c script_ops.c
space_script.c space_script.c

120
source/blender/editors/space_script/script_header.c
View File

@ -1,120 +0,0 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
*
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_script/script_header.c
* \ingroup spscript
*/
#include <string.h>
#include <stdio.h>
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "ED_screen.h"
#include "ED_types.h"
#include "ED_util.h"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_view2d.h"
#include "script_intern.h"
/* ************************ header area region *********************** */
static void do_viewmenu(bContext *UNUSED(C), void *UNUSED(arg), int UNUSED(event))
{
}
static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *UNUSED(arg))
{
ScrArea *curarea= CTX_wm_area(C);
uiBlock *block;
short yco= 0, menuwidth=120;
block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
uiBlockSetButmFunc(block, do_viewmenu, NULL);
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20,
menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
if(curarea->headertype==HEADERTOP) {
uiBlockSetDirection(block, UI_DOWN);
}
else {
uiBlockSetDirection(block, UI_TOP);
uiBlockFlipOrder(block);
}
uiTextBoundsBlock(block, 50);
uiEndBlock(C, block);
return block;
}
static void do_script_buttons(bContext *UNUSED(C), void *UNUSED(arg), int UNUSED(event))
{
//switch(event) {
//}
}
void script_header_buttons(const bContext *C, ARegion *ar)
{
ScrArea *sa= CTX_wm_area(C);
uiBlock *block;
int xco, yco= 3;
block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
uiBlockSetHandleFunc(block, do_script_buttons, NULL);
xco= ED_area_header_standardbuttons(C, block, yco);
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, UI_UNIT_Y, "");
xco+=UI_UNIT_X+xmax;
}
uiBlockSetEmboss(block, UI_EMBOSS);
/* always as last */
UI_view2d_totRect_set(&ar->v2d, xco+UI_UNIT_X+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin);
uiEndBlock(C, block);
uiDrawBlock(C, block);
}

4
source/blender/editors/space_script/script_intern.h
View File

@ -33,10 +33,6 @@
/* internal exports only */ /* internal exports only */
/* script_header.c */
void script_header_buttons(const bContext *C, ARegion *ar);
/* script_ops.c */ /* script_ops.c */
void script_operatortypes(void); void script_operatortypes(void);
void script_keymap(struct wmKeyConfig *keyconf); void script_keymap(struct wmKeyConfig *keyconf);

43
source/blender/editors/space_sound/CMakeLists.txt
View File

@ -1,43 +0,0 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Jacques Beaurain.
#
# ***** END GPL LICENSE BLOCK *****
set(INC
../include
../../blenkernel
../../blenlib
../../blenloader
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
set(SRC
sound_header.c
space_sound.c
sound_intern.h
)
blender_add_lib(bf_editor_space_sound "${SRC}" "${INC}" "${INC_SYS}")

9
source/blender/editors/space_sound/SConscript
View File

@ -1,9 +0,0 @@
#!/usr/bin/python
Import ('env')
sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
env.BlenderLib ( 'bf_editors_space_sound', sources, Split(incs), [], libtype=['core'], priority=[75] )

127
source/blender/editors/space_sound/sound_header.c
View File

@ -1,127 +0,0 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
*
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_sound/sound_header.c
* \ingroup spsnd
*/
#include <string.h>
#include <stdio.h>
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "ED_screen.h"
#include "ED_types.h"
#include "ED_util.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_view2d.h"
#include "sound_intern.h"
/* ************************ header area region *********************** */
static void do_viewmenu(bContext *UNUSED(C), void *UNUSED(arg), int UNUSED(event))
{
}
static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *UNUSED(arg))
{
ScrArea *curarea= CTX_wm_area(C);
uiBlock *block;
short yco= 0, menuwidth=120;
block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
uiBlockSetButmFunc(block, do_viewmenu, NULL);
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20,
menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
if(curarea->headertype==HEADERTOP) {
uiBlockSetDirection(block, UI_DOWN);
}
else {
uiBlockSetDirection(block, UI_TOP);
uiBlockFlipOrder(block);
}
uiTextBoundsBlock(block, 50);
uiEndBlock(C, block);
return block;
}
static void do_sound_buttons(bContext *UNUSED(C), void *UNUSED(arg), int event)
{
switch(event) {
}
}
void sound_header_buttons(const bContext *C, ARegion *ar)
{
ScrArea *sa= CTX_wm_area(C);
uiBlock *block;
int xco, yco= 3;
block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
uiBlockSetHandleFunc(block, do_sound_buttons, NULL);
xco= ED_area_header_standardbuttons(C, block, yco);
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, UI_UNIT_Y, "");
xco+=UI_UNIT_X+xmax;
}
uiBlockSetEmboss(block, UI_EMBOSS);
/* always as last */
UI_view2d_totRect_set(&ar->v2d, xco+UI_UNIT_X+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin);
uiEndBlock(C, block);
uiDrawBlock(C, block);
}

42
source/blender/editors/space_sound/sound_intern.h
View File

@ -1,42 +0,0 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
*
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_sound/sound_intern.h
* \ingroup spsnd
*/
#ifndef ED_SOUND_INTERN_H
#define ED_SOUND_INTERN_H
/* internal exports only */
/* sound_header.c */
void sound_header_buttons(const bContext *C, ARegion *ar);
#endif /* ED_SOUND_INTERN_H */

266
source/blender/editors/space_sound/space_sound.c
View File

@ -1,266 +0,0 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
*
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/editors/space_sound/space_sound.c
* \ingroup spsnd
*/
#include <string.h>
#include <stdio.h>
#include "DNA_scene_types.h"
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_screen.h"
#include "ED_space_api.h"
#include "ED_screen.h"
#include "BIF_gl.h"
#include "WM_api.h"
#include "WM_types.h"
#include "UI_resources.h"
#include "UI_view2d.h"
#include "sound_intern.h" // own include
/* ******************** default callbacks for sound space ***************** */
static SpaceLink *sound_new(const bContext *UNUSED(C))
{
ARegion *ar;
SpaceSound *ssound;
ssound= MEM_callocN(sizeof(SpaceSound), "initsound");
ssound->spacetype= SPACE_SOUND;
/* header */
ar= MEM_callocN(sizeof(ARegion), "header for sound");
BLI_addtail(&ssound->regionbase, ar);
ar->regiontype= RGN_TYPE_HEADER;
ar->alignment= RGN_ALIGN_BOTTOM;
/* main area */
ar= MEM_callocN(sizeof(ARegion), "main area for sound");
BLI_addtail(&ssound->regionbase, ar);
ar->regiontype= RGN_TYPE_WINDOW;
ar->v2d.tot.xmin= -4.0f;
ar->v2d.tot.ymin= -4.0f;
ar->v2d.tot.xmax= 250.0f;
ar->v2d.tot.ymax= 255.0f;
ar->v2d.cur.xmin= -4.0f;
ar->v2d.cur.ymin= -4.0f;
ar->v2d.cur.xmax= 50.0f;
ar->v2d.cur.ymax= 255.0f;
ar->v2d.min[0]= 1.0f;
ar->v2d.min[1]= 259.0f;
ar->v2d.max[0]= MAXFRAMEF;
ar->v2d.max[1]= 259.0f;
ar->v2d.minzoom= 0.1f;
ar->v2d.maxzoom= 10.0f;
ar->v2d.scroll = (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
ar->v2d.scroll |= (V2D_SCROLL_LEFT);
ar->v2d.keepzoom= 0;
ar->v2d.keeptot= 0;
ar->v2d.keepzoom = V2D_LOCKZOOM_Y;
return (SpaceLink *)ssound;
}
/* not spacelink itself */
static void sound_free(SpaceLink *UNUSED(sl))
{
// SpaceSound *ssound= (SpaceSound*) sl;
}
/* spacetype; init callback */
static void sound_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
{
}
static SpaceLink *sound_duplicate(SpaceLink *sl)
{
SpaceSound *ssoundn= MEM_dupallocN(sl);
/* clear or remove stuff from old */
return (SpaceLink *)ssoundn;
}
/* add handlers, stuff you only do once or on area/region changes */
static void sound_main_area_init(wmWindowManager *wm, ARegion *ar)
{
wmKeyMap *keymap;
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
/* own keymap */
keymap= WM_keymap_find(wm->defaultconf, "Sound", SPACE_SOUND, 0);
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
}
static void sound_main_area_draw(const bContext *C, ARegion *ar)
{
/* draw entirely, view changes should be handled here */
// SpaceSound *ssound= (SpaceSound*)CTX_wm_space_data(C);
View2D *v2d= &ar->v2d;
/* clear and setup matrix */
UI_ThemeClearColor(TH_BACK);
glClear(GL_COLOR_BUFFER_BIT);
UI_view2d_view_ortho(v2d);
/* data... */
/* reset view matrix */
UI_view2d_view_restore(C);
/* scrollers? */
}
static void sound_operatortypes(void)
{
}
static void sound_keymap(struct wmKeyConfig *UNUSED(keyconf))
{
}
/* add handlers, stuff you only do once or on area/region changes */
static void sound_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
{
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
}
static void sound_header_area_draw(const bContext *C, ARegion *ar)
{
float col[3];
/* clear */
if(ED_screen_area_active(C))
UI_GetThemeColor3fv(TH_HEADER, col);
else
UI_GetThemeColor3fv(TH_HEADERDESEL, col);
glClearColor(col[0], col[1], col[2], 0.0);
glClear(GL_COLOR_BUFFER_BIT);
/* set view2d view matrix for scrolling (without scrollers) */
UI_view2d_view_ortho(&ar->v2d);
sound_header_buttons(C, ar);
/* restore view matrix? */
UI_view2d_view_restore(C);
}
static void sound_main_area_listener(ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn))
{
/* context changes */
}
/* only called once, from space/spacetypes.c */
void ED_spacetype_sound(void)
{
SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype sound");
ARegionType *art;
st->spaceid= SPACE_SOUND;
strncpy(st->name, "Sound", BKE_ST_MAXNAME);
st->new= sound_new;
st->free= sound_free;
st->init= sound_init;
st->duplicate= sound_duplicate;
st->operatortypes= sound_operatortypes;
st->keymap= sound_keymap;
/* regions: main window */
art= MEM_callocN(sizeof(ARegionType), "spacetype sound region");
art->regionid = RGN_TYPE_WINDOW;
art->init= sound_main_area_init;
art->draw= sound_main_area_draw;
art->listener= sound_main_area_listener;
art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES;
BLI_addhead(&st->regiontypes, art);
/* regions: header */
art= MEM_callocN(sizeof(ARegionType), "spacetype sound region");
art->regionid = RGN_TYPE_HEADER;
art->prefsizey= HEADERY;
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_HEADER;
art->init= sound_header_area_init;
art->draw= sound_header_area_draw;
BLI_addhead(&st->regiontypes, art);
/* regions: channels */
art= MEM_callocN(sizeof(ARegionType), "spacetype sound region");
art->regionid = RGN_TYPE_CHANNELS;
art->prefsizex= 80;
art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
// art->init= sound_channel_area_init;
// art->draw= sound_channel_area_draw;
BLI_addhead(&st->regiontypes, art);
BKE_spacetype_register(st);
}

3
source/blender/editors/space_time/time_intern.h
View File

@ -40,8 +40,5 @@ struct wmWindowManager;
void time_operatortypes(void); void time_operatortypes(void);
void time_keymap(struct wmKeyConfig *keyconf); void time_keymap(struct wmKeyConfig *keyconf);
/* time_header.c */
void time_header_buttons(const bContext *C, ARegion *ar);
#endif /* ED_TIME_INTERN_H */ #endif /* ED_TIME_INTERN_H */

2
source/blender/editors/transform/transform_ops.c
View File

@ -610,7 +610,7 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
ot->exec = transform_exec; ot->exec = transform_exec;
ot->modal = transform_modal; ot->modal = transform_modal;
ot->cancel = transform_cancel; ot->cancel = transform_cancel;
ot->poll = ED_operator_editcurve; ot->poll = ED_operator_editcurve_3d;
RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);

84
source/blender/makesdna/DNA_space_types.h
View File

@ -432,68 +432,6 @@ typedef struct SpaceLogic {
struct bGPdata *gpd; /* grease-pencil data */ struct bGPdata *gpd; /* grease-pencil data */
} SpaceLogic; } SpaceLogic;
/* note, this entire struct isnt used anymore!,
* may remove some day - campbell */
typedef struct SpaceImaSel {
SpaceLink *next, *prev;
ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
short blockhandler[8];
View2D v2d; /* deprecated, copied to region */
struct FileList *files;
/* specific stuff for drawing */
char title[24];
char dir[240];
char file[80];
short type, menu, flag, sort;
void *curfont;
int active_file;
int numtilesx;
int numtilesy;
int selstate;
struct rcti viewrect;
struct rcti bookmarkrect;
float scrollpos; /* current position of scrollhandle */
float scrollheight; /* height of the scrollhandle */
float scrollarea; /* scroll region, scrollpos is from 0 to scrollarea */
float aspect;
unsigned short retval; /* event */
short ipotype;
short filter;
short active_bookmark;
short pad, pad1;
/* view settings */
short prv_w;
short prv_h;
/* one day we'll add unions to dna */
void (*returnfunc)(char *);
void (*returnfunc_event)(unsigned short);
void (*returnfunc_args)(char *, void *, void *);
void *arg1, *arg2;
short *menup; /* pointer to menu result or ID browsing */
char *pupmenu; /* optional menu in header */
struct ImBuf *img;
} SpaceImaSel;
typedef struct ConsoleLine { typedef struct ConsoleLine {
struct ConsoleLine *next, *prev; struct ConsoleLine *next, *prev;
@ -545,22 +483,6 @@ typedef struct SpaceUserPref {
} SpaceUserPref; } SpaceUserPref;
typedef struct SpaceSound {
struct SpaceLink *next, *prev;
ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
struct ScrArea *area;
View2D v2d;
struct bSound *sound;
short mode, sndnr;
short xof, yof;
short flag, lock;
int pad2;
} SpaceSound;
/* view3d Now in DNA_view3d_types.h */ /* view3d Now in DNA_view3d_types.h */
@ -947,11 +869,11 @@ enum {
SPACE_INFO, SPACE_INFO,
SPACE_SEQ, SPACE_SEQ,
SPACE_TEXT, SPACE_TEXT,
SPACE_IMASEL, SPACE_IMASEL, /* deprecated */
SPACE_SOUND, SPACE_SOUND, /* Deprecated */
SPACE_ACTION, SPACE_ACTION,
SPACE_NLA, SPACE_NLA,
SPACE_SCRIPT, SPACE_SCRIPT, /* Deprecated */
SPACE_TIME, SPACE_TIME,
SPACE_NODE, SPACE_NODE,
SPACE_LOGIC, SPACE_LOGIC,

4
source/blender/makesdna/DNA_userdef_types.h
View File

@ -267,13 +267,11 @@ typedef struct bTheme {
ThemeSpace tv3d; ThemeSpace tv3d;
ThemeSpace tfile; ThemeSpace tfile;
ThemeSpace tipo; ThemeSpace tipo;
ThemeSpace tinfo; ThemeSpace tinfo;
ThemeSpace tsnd;
ThemeSpace tact; ThemeSpace tact;
ThemeSpace tnla; ThemeSpace tnla;
ThemeSpace tseq; ThemeSpace tseq;
ThemeSpace tima; ThemeSpace tima;
ThemeSpace timasel;
ThemeSpace text; ThemeSpace text;
ThemeSpace toops; ThemeSpace toops;
ThemeSpace ttime; ThemeSpace ttime;

9
source/blender/makesrna/intern/rna_space.c
View File

@ -60,11 +60,8 @@ EnumPropertyItem space_type_items[] = {
{SPACE_INFO, "INFO", 0, "Info", ""}, {SPACE_INFO, "INFO", 0, "Info", ""},
{SPACE_SEQ, "SEQUENCE_EDITOR", 0, "Sequence Editor", ""}, {SPACE_SEQ, "SEQUENCE_EDITOR", 0, "Sequence Editor", ""},
{SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""}, {SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""},
//{SPACE_IMASEL, "IMAGE_BROWSER", 0, "Image Browser", ""},
{SPACE_SOUND, "AUDIO_WINDOW", 0, "Audio Window", ""},
{SPACE_ACTION, "DOPESHEET_EDITOR", 0, "DopeSheet Editor", ""}, {SPACE_ACTION, "DOPESHEET_EDITOR", 0, "DopeSheet Editor", ""},
{SPACE_NLA, "NLA_EDITOR", 0, "NLA Editor", ""}, {SPACE_NLA, "NLA_EDITOR", 0, "NLA Editor", ""},
{SPACE_SCRIPT, "SCRIPTS_WINDOW", 0, "Scripts Window", ""},
{SPACE_TIME, "TIMELINE", 0, "Timeline", ""}, {SPACE_TIME, "TIMELINE", 0, "Timeline", ""},
{SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""}, {SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""},
{SPACE_LOGIC, "LOGIC_EDITOR", 0, "Logic Editor", ""}, {SPACE_LOGIC, "LOGIC_EDITOR", 0, "Logic Editor", ""},
@ -152,16 +149,10 @@ static StructRNA* rna_Space_refine(struct PointerRNA *ptr)
return &RNA_SpaceSequenceEditor; return &RNA_SpaceSequenceEditor;
case SPACE_TEXT: case SPACE_TEXT:
return &RNA_SpaceTextEditor; return &RNA_SpaceTextEditor;
//case SPACE_IMASEL:
// return &RNA_SpaceImageBrowser;
/*case SPACE_SOUND:
return &RNA_SpaceAudioWindow;*/
case SPACE_ACTION: case SPACE_ACTION:
return &RNA_SpaceDopeSheetEditor; return &RNA_SpaceDopeSheetEditor;
case SPACE_NLA: case SPACE_NLA:
return &RNA_SpaceNLA; return &RNA_SpaceNLA;
/*case SPACE_SCRIPT:
return &RNA_SpaceScriptsWindow;*/
case SPACE_TIME: case SPACE_TIME:
return &RNA_SpaceTimeline; return &RNA_SpaceTimeline;
case SPACE_NODE: case SPACE_NODE:

34
source/blender/makesrna/intern/rna_userdef.c
View File

@ -1392,7 +1392,7 @@ static void rna_def_userdef_theme_space_logic(BlenderRNA *brna)
StructRNA *srna; StructRNA *srna;
PropertyRNA *prop; PropertyRNA *prop;
/* space_buts */ /* space_logic */
srna= RNA_def_struct(brna, "ThemeLogicEditor", NULL); srna= RNA_def_struct(brna, "ThemeLogicEditor", NULL);
RNA_def_struct_sdna(srna, "ThemeSpace"); RNA_def_struct_sdna(srna, "ThemeSpace");
@ -1451,37 +1451,6 @@ static void rna_def_userdef_theme_space_time(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_update"); RNA_def_property_update(prop, 0, "rna_userdef_update");
} }
static void rna_def_userdef_theme_space_sound(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
/* space_sound */
srna= RNA_def_struct(brna, "ThemeAudioWindow", NULL);
RNA_def_struct_sdna(srna, "ThemeSpace");
RNA_def_struct_ui_text(srna, "Theme Audio Window", "Theme settings for the Audio Window");
rna_def_userdef_theme_spaces_main(srna, SPACE_SOUND);
prop= RNA_def_property(srna, "grid", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Grid", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "window_sliders", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "shade1");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Window Sliders", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "cframe");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Current Frame", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
}
static void rna_def_userdef_theme_space_image(BlenderRNA *brna) static void rna_def_userdef_theme_space_image(BlenderRNA *brna)
{ {
StructRNA *srna; StructRNA *srna;
@ -1956,7 +1925,6 @@ static void rna_def_userdef_dothemes(BlenderRNA *brna)
rna_def_userdef_theme_space_info(brna); rna_def_userdef_theme_space_info(brna);
rna_def_userdef_theme_space_userpref(brna); rna_def_userdef_theme_space_userpref(brna);
rna_def_userdef_theme_space_console(brna); rna_def_userdef_theme_space_console(brna);
rna_def_userdef_theme_space_sound(brna);
rna_def_userdef_theme_space_logic(brna); rna_def_userdef_theme_space_logic(brna);
rna_def_userdef_theme_colorset(brna); rna_def_userdef_theme_colorset(brna);
rna_def_userdef_themes(brna); rna_def_userdef_themes(brna);

8
source/blender/modifiers/intern/MOD_solidify.c
View File

@ -126,7 +126,7 @@ static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
NOCALC_EDGEWEIGHT_ADD_EDGEREF_FACE(ml[j].v, ml[(j+1)%mp->totloop].v); NOCALC_EDGEWEIGHT_ADD_EDGEREF_FACE(ml[j].v, ml[(j+1)%mp->totloop].v);
} }
} }
for(edge_iter = BLI_edgehashIterator_new(edge_hash); !BLI_edgehashIterator_isDone(edge_iter); BLI_edgehashIterator_step(edge_iter)) { for(edge_iter = BLI_edgehashIterator_new(edge_hash); !BLI_edgehashIterator_isDone(edge_iter); BLI_edgehashIterator_step(edge_iter)) {
/* Get the edge vert indices, and edge value (the face indices that use it)*/ /* Get the edge vert indices, and edge value (the face indices that use it)*/
BLI_edgehashIterator_getKey(edge_iter, (int*)&ed_v1, (int*)&ed_v2); BLI_edgehashIterator_getKey(edge_iter, (int*)&ed_v1, (int*)&ed_v2);
@ -449,7 +449,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
normal_short_to_float_v3(vert_nors[i], mv->no); normal_short_to_float_v3(vert_nors[i], mv->no);
} }
} }
for (i=0, mp=mpoly; i<numFaces; i++, mp++) { for (i=0, mp=mpoly; i<numFaces; i++, mp++) {
mesh_calc_poly_normal(mp, mloop+mp->loopstart, mvert, face_nors[i]); mesh_calc_poly_normal(mp, mloop+mp->loopstart, mvert, face_nors[i]);
@ -684,10 +684,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
add_v3_v3(edge_vert_nos[ed->v1], nor); add_v3_v3(edge_vert_nos[ed->v1], nor);
add_v3_v3(edge_vert_nos[ed->v2], nor); add_v3_v3(edge_vert_nos[ed->v2], nor);
#endif #endif
if (origindex) {
origindex[numFaces * 2 + i]= fidx;
}
} }
#ifdef SOLIDIFY_SIDE_NORMALS #ifdef SOLIDIFY_SIDE_NORMALS

2
source/blender/nodes/texture/nodes/node_texture_scale.c
View File

@ -35,7 +35,7 @@
static bNodeSocketTemplate inputs[]= { static bNodeSocketTemplate inputs[]= {
{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f }, { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f },
{ SOCK_VECTOR, 1, "Scale", 1.0f, 1.0f, 1.0f, 0.0f, -10.0f, 10.0f, PROP_FACTOR }, { SOCK_VECTOR, 1, "Scale", 1.0f, 1.0f, 1.0f, 0.0f, -10.0f, 10.0f, PROP_XYZ },
{ -1, 0, "" } { -1, 0, "" }
}; };

6
source/blender/python/simple_enum_gen.py
View File

@ -29,11 +29,11 @@ defs = """
SPACE_INFO, SPACE_INFO,
SPACE_SEQ, SPACE_SEQ,
SPACE_TEXT, SPACE_TEXT,
SPACE_IMASEL, SPACE_IMASEL, #Deprecated
SPACE_SOUND, SPACE_SOUND, #Deprecated
SPACE_ACTION, SPACE_ACTION,
SPACE_NLA, SPACE_NLA,
SPACE_SCRIPT, SPACE_SCRIPT, #Deprecated
SPACE_TIME, SPACE_TIME,
SPACE_NODE, SPACE_NODE,
SPACEICONMAX SPACEICONMAX