Revision: 41454
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41454
Author: campbellbarton
Date: 2011-11-01 23:24:51 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
svn merge -r41431:41453 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41431
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/SConscript
branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_space_api.h
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_intern.h
branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
branches/bmesh/blender/source/blender/editors/space_nla/nla_intern.h
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/bmesh/blender/source/blender/editors/space_script/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/space_script/script_intern.h
branches/bmesh/blender/source/blender/editors/space_time/time_intern.h
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/bmesh/blender/source/blender/python/simple_enum_gen.py
Removed Paths:
-------------
branches/bmesh/blender/source/blender/editors/space_script/script_header.c
branches/bmesh/blender/source/blender/editors/space_sound/
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41431
+ /trunk/blender:39992-41453
Modified:
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
2011-11-01 23:24:51 UTC (rev 41454)
@@ -29,8 +29,8 @@
"source/blender/imbuf/intern/imbuf_cocoa.m",
"extern/recastnavigation/Recast/Source/RecastLog.cpp",
"extern/recastnavigation/Recast/Source/RecastTimer.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -45,6 +45,10 @@
"extern/eltopo/common/meshes/TriangleIndex.hpp",
"extern/eltopo/common/meshes/meshloader.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
"source/blender/bmesh/editmesh_tools.c",
@@ -54,10 +58,6 @@
"source/blender/bmesh/tools/BME_duplicate.c",
"source/blender/bmesh/tools/BME_extrude.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
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41431
+ /trunk/blender/release:31524-41453
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
2011-11-01 23:24:51 UTC (rev 41454)
@@ -192,6 +192,8 @@
image_new.file_format = 'PNG'
image_new.save()
+ filepath_final = bpy.path.abspath(filepath_final)
+
try:
bpy.ops.image.external_edit(filepath=filepath_final)
except RuntimeError as re:
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-11-01 23:01:57 UTC (rev 41453)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-11-01 23:24:51 UTC (rev 41454)
@@ -209,7 +209,7 @@
col.operator("transform.resize", text="Scale")
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 = layout.column(align=True)
Modified: branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
2011-11-01 23:24:51 UTC (rev 41454)
@@ -120,7 +120,7 @@
const char *short_locale;
int ok= 1;
#if defined (_WIN32) && !defined(FREE_WINDOWS)
- char *long_locale = locales[ 2 * U.language];
+ const char *long_locale = locales[ 2 * U.language];
#endif
if((U.transopts&USER_DOTRANSLATE)==0)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
2011-11-01 23:24:51 UTC (rev 41454)
@@ -77,6 +77,8 @@
#include "BKE_smoke.h"
+#ifdef WITH_SMOKE
+
#ifdef _WIN32
#include <time.h>
#include <stdio.h>
@@ -131,12 +133,13 @@
#define TRI_UVOFFSET (1./4.)
-#ifdef WITH_SMOKE
/* forward declerations */
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 fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings
*scs);
+
#else /* WITH_SMOKE */
+
/* Stubs to use when smoke is disabled */
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; }
@@ -146,9 +149,11 @@
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; }
void smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene),
Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) {}
+
#endif /* WITH_SMOKE */
#ifdef WITH_SMOKE
+
static int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene
*scene, DerivedMesh *dm)
{
if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain &&
!smd->domain->fluid)
Modified: branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
2011-11-01 23:24:51 UTC (rev 41454)
@@ -44,7 +44,6 @@
struct ReportList;
struct Scene;
struct SpaceFile;
-struct SpaceImaSel;
struct UserDef;
struct bContext;
struct BHead;
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-11-01 23:01:57 UTC (rev 41453)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-11-01 23:24:51 UTC (rev 41454)
@@ -4993,15 +4993,6 @@
sfile->folders_prev= 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) {
SpaceAction *saction=
(SpaceAction *)sl;
bDopeSheet *ads= &saction->ads;
@@ -5065,11 +5056,6 @@
}
}
}
- 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) {
SpaceNode *snode= (SpaceNode
*)sl;
@@ -5226,12 +5212,6 @@
SpaceFile *sfile= (SpaceFile *)sl;
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) {
SpaceAction *saction= (SpaceAction *)sl;
@@ -5298,11 +5278,6 @@
}
}
}
- 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) {
SpaceNode *snode= (SpaceNode *)sl;
@@ -6690,16 +6665,6 @@
//ar->v2d.flag |= V2D_IS_INITIALISED;
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:
{
SpaceNla *snla= (SpaceNla *)sl;
@@ -6815,12 +6780,18 @@
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) {
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 */
sa->butspacetype= sa->spacetype;
@@ -9219,7 +9190,6 @@
}
if(main->versionfile <= 245) {
Scene *sce;
- bScreen *sc;
Object *ob;
Image *ima;
Lamp *la;
@@ -9309,49 +9279,6 @@
for(ima= main->image.first; ima; ima= ima->id.next) {
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;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
