[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14208] trunk/blender: NDOF support added to trunk from ndof branch.
Revision: 14208
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14208
Author: lukep
Date: 2008-03-22 02:39:11 +0100 (Sat, 22 Mar 2008)
Log Message:
---
NDOF support added to trunk from ndof branch.
The latter is now obsolete and will be soon
removed.
Some tiny build tweaks for darwin committed
in preparation of bigger changes for proper
SDK suport both on intel and ppc
Modified Paths:
--
trunk/blender/SConstruct
trunk/blender/config/darwin-config.py
trunk/blender/extern/ffmpeg/SConscript
trunk/blender/intern/ghost/GHOST_C-api.h
trunk/blender/intern/ghost/GHOST_ISystem.h
trunk/blender/intern/ghost/GHOST_Types.h
trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
trunk/blender/intern/ghost/intern/GHOST_System.cpp
trunk/blender/intern/ghost/intern/GHOST_System.h
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.h
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
trunk/blender/intern/ghost/intern/Makefile
trunk/blender/intern/ghost/make/msvc_7_0/ghost.vcproj
trunk/blender/release/datafiles/blenderbuttons
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenlib/BLI_blenlib.h
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/include/BIF_mywindow.h
trunk/blender/source/blender/include/BIF_resources.h
trunk/blender/source/blender/include/BIF_transform.h
trunk/blender/source/blender/include/BSE_view.h
trunk/blender/source/blender/include/blendef.h
trunk/blender/source/blender/include/mydevice.h
trunk/blender/source/blender/include/transform.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/src/blenderbuttons.c
trunk/blender/source/blender/src/editscreen.c
trunk/blender/source/blender/src/ghostwinlay.c
trunk/blender/source/blender/src/header_view3d.c
trunk/blender/source/blender/src/space.c
trunk/blender/source/blender/src/transform.c
trunk/blender/source/blender/src/transform_generics.c
trunk/blender/source/blender/src/usiblender.c
trunk/blender/source/blender/src/view.c
trunk/blender/source/blender/src/winlay.h
Added Paths:
---
trunk/blender/intern/ghost/intern/GHOST_EventNDOF.h
trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
trunk/blender/intern/ghost/intern/GHOST_NDOFManager.h
trunk/blender/source/blender/src/transform_ndofinput.c
Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2008-03-21 23:10:23 UTC (rev 14207)
+++ trunk/blender/SConstruct2008-03-22 01:39:11 UTC (rev 14208)
@@ -350,33 +350,36 @@
blenderinstall = env.Install(dir=env['BF_INSTALLDIR'],
source=B.program_list)
#-- .blender
+#- dont do .blender and scripts for darwin, it is already in the bundle
dotblendlist = []
dottargetlist = []
-for dp, dn, df in os.walk('bin/.blender'):
-if 'CVS' in dn:
-dn.remove('CVS')
-if '.svn' in dn:
-dn.remove('.svn')
-for f in df:
-dotblendlist.append(dp+os.sep+f)
-dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
+scriptinstall = []
-dotblenderinstall = []
-for targetdir,srcfile in zip(dottargetlist, dotblendlist):
-td, tf = os.path.split(targetdir)
-dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+if env['OURPLATFORM']!='darwin':
+ for dp, dn, df in os.walk('bin/.blender'):
+ if 'CVS' in dn:
+ dn.remove('CVS')
+ if '.svn' in dn:
+ dn.remove('.svn')
+ for f in df:
+ dotblendlist.append(dp+os.sep+f)
+ dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
-#-- .blender/scripts
-scriptinstall = []
-scriptpath='release/scripts'
-for dp, dn, df in os.walk(scriptpath):
-if 'CVS' in dn:
-dn.remove('CVS')
-if '.svn' in dn:
-dn.remove('.svn')
-dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
-source=[dp+os.sep+f for f in df]
-scriptinstall.append(env.Install(dir=dir,source=source))
+ dotblenderinstall = []
+ for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+ td, tf = os.path.split(targetdir)
+ dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+
+ #-- .blender/scripts
+ scriptpath='release/scripts'
+ for dp, dn, df in os.walk(scriptpath):
+ if 'CVS' in dn:
+ dn.remove('CVS')
+ if '.svn' in dn:
+ dn.remove('.svn')
+ dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(s
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14207] trunk/blender/source/blender: Removing some compiler warnings.
Revision: 14207
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14207
Author: aligorith
Date: 2008-03-22 00:10:23 +0100 (Sat, 22 Mar 2008)
Log Message:
---
Removing some compiler warnings.
(Note to who-ever made all the changes referring to r.scemode:
r.scemode is an int, not a short!)
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/python/api2_2x/Mesh.c
trunk/blender/source/blender/python/api2_2x/sceneRender.c
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/blender/src/header_node.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2008-03-21
23:06:15 UTC (rev 14206)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2008-03-21
23:10:23 UTC (rev 14207)
@@ -8677,8 +8677,6 @@
void BLO_library_append_(BlendHandle** libfiledata, struct direntry* filelist,
int totfile, char *dir, char* file, short flag, int idcode)
{
- FileData *fd= (FileData*) (*libfiledata);
- int lastflags = fd->flags;
Library *curlib;
Base *centerbase;
Object *ob;
Modified: trunk/blender/source/blender/python/api2_2x/Mesh.c
===
--- trunk/blender/source/blender/python/api2_2x/Mesh.c 2008-03-21 23:06:15 UTC
(rev 14206)
+++ trunk/blender/source/blender/python/api2_2x/Mesh.c 2008-03-21 23:10:23 UTC
(rev 14207)
@@ -7557,6 +7557,7 @@
CalcNormFloat4( v1->co, v2->co, v3->co, v4->co, fno );
} else {
+ v4 = NULL;
CalcNormFloat( v1->co, v2->co, v3->co, fno );
}
Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-03-21
23:06:15 UTC (rev 14206)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-03-21
23:10:23 UTC (rev 14207)
@@ -657,20 +657,20 @@
PyObject *RenderData_EnableExtensions( BPy_RenderData * self, PyObject * args )
{
- return M_Render_BitToggleShort( args, R_EXTENSION,
+ return M_Render_BitToggleInt( args, R_EXTENSION,
&self->renderContext->scemode );
}
PyObject *RenderData_EnableSequencer( BPy_RenderData * self, PyObject * args )
{
- return M_Render_BitToggleShort( args, R_DOSEQ,
+ return M_Render_BitToggleInt( args, R_DOSEQ,
&self->renderContext->scemode );
}
PyObject *RenderData_EnableRenderDaemon( BPy_RenderData * self,
PyObject * args )
{
- return M_Render_BitToggleShort( args, R_BG_RENDER,
+ return M_Render_BitToggleInt( args, R_BG_RENDER,
&self->renderContext->scemode );
}
Modified: trunk/blender/source/blender/src/buttons_scene.c
===
--- trunk/blender/source/blender/src/buttons_scene.c2008-03-21 23:06:15 UTC
(rev 14206)
+++ trunk/blender/source/blender/src/buttons_scene.c2008-03-21 23:10:23 UTC
(rev 14207)
@@ -2041,15 +2041,15 @@
uiDefButBitS(block, TOG, 1<<(3*b+a), 800,"",
(short)(10+18*a),(short)(10+14*b),16,12, &G.winpos, 0, 0, 0, 0, "Render window
placement on screen");
uiBlockBeginAlign(block);
- uiDefButBitS(block, TOG, R_EXR_TILE_FILE, B_REDR, "Save Buffers", 72,
31, 120, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Save tiles for all
RenderLayers and used SceneNodes to files in the temp directory (saves memory,
allows Full Sampling)");
+ uiDefButBitI(block, TOG, R_EXR_TILE_FILE, B_REDR, "Save Buffers", 72,
31, 120, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Save tiles for all
RenderLayers and used SceneNodes to files in the temp directory (saves memory,
allows Full Sampling)");
if(G.scene->r.scemode & R_EXR_TILE_FILE)
- uiDefButBitS(block, TOG, R_FULL_SAMPLE, B_REDR, "FullSample",
192, 31, 118, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Saves for every OSA
sample the entire RenderLayer results (Higher quality sampling but slower)");
+ uiDefButBitI(block, TOG, R_FULL_SAMPLE, B_REDR, "FullSample",
192, 31, 118, 19, &G.scene->r.scemode, 0.0, 0.0, 0, 0, "Saves for every OSA
sample the entire RenderLayer results (Higher quality sampling but slower)");
uiBlockEndAlign(block);
uiDefButS(block, MENU, B_REDR, "Render Display %t|Render Window
%x1|Image Editor %x0|Full Screen %x2",
72, 10, 120, 19, &G.displaymode, 0.0,
(float)R_D
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14206] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fixed bug #8597, Subsurf error
Revision: 14206
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14206
Author: nicholasbishop
Date: 2008-03-22 00:06:15 +0100 (Sat, 22 Mar 2008)
Log Message:
---
Fixed bug #8597, Subsurf error
This was actually an error with the array modifier. Merging vertices would
sometimes create degenerate faces (e.g. face.v1 == face.v3)
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/modifier.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-03-21
22:44:12 UTC (rev 14205)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-03-21
23:06:15 UTC (rev 14206)
@@ -1010,7 +1010,7 @@
numFaces++;
/* if the face has fewer than 3 vertices, don't create it */
- if(mf->v3 == 0) {
+ if(mf->v3 == 0 || (mf->v1 && (mf->v1 == mf->v3 || mf->v1 ==
mf->v4))) {
numFaces--;
DM_free_face_data(result, numFaces, 1);
}
@@ -1032,7 +1032,7 @@
numFaces++;
/* if the face has fewer than 3 vertices, don't create
it */
- if(mf2->v3 == 0) {
+ if(mf2->v3 == 0 || (mf->v1 && (mf->v1 == mf->v3 ||
mf->v1 == mf->v4))) {
numFaces--;
DM_free_face_data(result, numFaces, 1);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14205] trunk/blender/source/gameengine: Correction on BGE fixes:
Revision: 14205
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14205
Author: ben2610
Date: 2008-03-21 23:44:12 +0100 (Fri, 21 Mar 2008)
Log Message:
---
Correction on BGE fixes:
- check that an object has been created before setting the physics environment
- check that there is an active camera before using it
- when a camera is deleted, remove it from m_cameras list
Modified Paths:
--
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-03-21 22:26:26 UTC (rev 14204)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-03-21 22:44:12 UTC (rev 14205)
@@ -1670,7 +1670,8 @@
break;
}
}
- gameobj->SetPhysicsEnvironment(kxscene->GetPhysicsEnvironment());
+ if (gameobj)
+
gameobj->SetPhysicsEnvironment(kxscene->GetPhysicsEnvironment());
return gameobj;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2008-03-21
22:26:26 UTC (rev 14204)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2008-03-21
22:44:12 UTC (rev 14205)
@@ -617,7 +617,7 @@
SetWorldSettings(scene->GetWorldInfo());
// Avoid drawing the scene with the active camera twice when
it's viewport is enabled
- if(!cam->GetViewport())
+ if(cam && !cam->GetViewport())
{
if (scene->IsClearingZBuffer())
m_rasterizer->ClearDepthBuffer();
@@ -854,6 +854,9 @@
RAS_Rect viewport;
+ if (!cam)
+ return;
+
if (cam->GetViewport()) {
viewport.SetLeft(cam->GetViewportLeft());
viewport.SetBottom(cam->GetViewportBottom());
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2008-03-21 22:26:26 UTC
(rev 14204)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2008-03-21 22:44:12 UTC
(rev 14205)
@@ -794,6 +794,9 @@
//m_active_camera->Release();
m_active_camera = NULL;
}
+ // in case this is a camera
+ m_cameras.remove((KX_Camera*)newobj);
+
if (m_sceneConverter)
m_sceneConverter->UnregisterGameObject(newobj);
// return value will be 0 if the object is actually deleted (all
reference gone)
@@ -942,6 +945,7 @@
m_cameras.push_back(cam);
}
+
KX_Camera* KX_Scene::GetActiveCamera()
{
// NULL if not defined
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14204] trunk/blender/source/blender/ render/intern/source/pipeline.c: This commit disables fix for revision 14202 effectively.
Revision: 14204
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14204
Author: ton
Date: 2008-03-21 23:26:26 +0100 (Fri, 21 Mar 2008)
Log Message:
---
This commit disables fix for revision 14202 effectively.
The claim was:
Bugfix: don't do full sample merging on re-rendered layers in
the compositor.
But result was that rendering didn't happen at all for scenes
with a composite.
I also don't understand the commit, seems like it's incomplete?
Revision Links:
--
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14202
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-03-21 21:03:31 UTC (rev 14203)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-03-21 22:26:26 UTC (rev 14204)
@@ -2156,7 +2156,7 @@
ntreeCompositTagAnimated(ntree);
}
- if(!(re->r.scemode & R_COMP_RERENDER)) {
+ if(1 || !(re->r.scemode & R_COMP_RERENDER)) {
if(ntree && re->r.scemode & R_DOCOMP) {
/* checks if there are render-result nodes that
need scene */
if((re->r.scemode & R_SINGLE_LAYER)==0)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14203] trunk/blender/source/blender/ blenkernel/intern/modifier.c: added camera shiftx/ y for the UVProject modifier
Revision: 14203
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14203
Author: campbellbarton
Date: 2008-03-21 22:03:31 +0100 (Fri, 21 Mar 2008)
Log Message:
---
added camera shiftx/y for the UVProject modifier
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/modifier.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-03-21
17:37:24 UTC (rev 14202)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-03-21
21:03:31 UTC (rev 14203)
@@ -3218,12 +3218,12 @@
for(i = 0; i < num_projectors; ++i) {
float tmpmat[4][4];
float offsetmat[4][4];
-
+ Camera *cam = NULL;
/* calculate projection matrix */
Mat4Invert(projectors[i].projmat, projectors[i].ob->obmat);
if(projectors[i].ob->type == OB_CAMERA) {
- Camera *cam = (Camera *)projectors[i].ob->data;
+ cam = (Camera *)projectors[i].ob->data;
if(cam->type == CAM_PERSP) {
float perspmat[4][4];
float xmax;
@@ -3273,6 +3273,20 @@
Mat4One(offsetmat);
Mat4MulFloat3(offsetmat[0], 0.5);
offsetmat[3][0] = offsetmat[3][1] = offsetmat[3][2] = 0.5;
+
+ if (cam) {
+ if (umd->aspectx == umd->aspecty) {
+ offsetmat[3][0] -= cam->shiftx;
+ offsetmat[3][1] -= cam->shifty;
+ } else if (umd->aspectx < umd->aspecty) {
+ offsetmat[3][0] -=(cam->shiftx *
umd->aspecty/umd->aspectx);
+ offsetmat[3][1] -= cam->shifty;
+ } else {
+ offsetmat[3][0] -= cam->shiftx;
+ offsetmat[3][1] -=(cam->shifty *
umd->aspectx/umd->aspecty);
+ }
+ }
+
Mat4MulMat4(projectors[i].projmat, tmpmat, offsetmat);
/* calculate worldspace projector normal (for best projector
test) */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14202] trunk/blender/source/blender:
Revision: 14202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14202
Author: blendix
Date: 2008-03-21 18:37:24 +0100 (Fri, 21 Mar 2008)
Log Message:
---
Bugfix: don't do full sample merging on re-rendered layers in
the compositor.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/src/editnode.c
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2008-03-21
17:13:35 UTC (rev 14201)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2008-03-21
17:37:24 UTC (rev 14202)
@@ -225,10 +225,12 @@
short bufflag;
short quality;
+ short rpad;
+
/**
* Flags for render settings. Use bit-masking to access the settings.
*/
- short scemode;
+ int scemode;
/**
* Flags for render settings. Use bit-masking to access the settings.
@@ -236,7 +238,7 @@
int mode;
/* render engine, octree resolution */
- short renderer, ocres, rpad[2];
+ short renderer, ocres;
/**
* What to do with the sky/background. Picks sky/premul/key
@@ -608,7 +610,7 @@
#define R_INTERN 0
#define R_YAFRAY 1
-/* scemode */
+/* scemode (int now) */
#define R_DOSEQ0x0001
#define R_BG_RENDER0x0002
/* passepartout is camera option now, keep this for backward
compatibility */
@@ -626,6 +628,7 @@
#define R_NO_TEX 0x2000
#define R_STAMP_INFO 0x4000
#define R_FULL_SAMPLE 0x8000
+#define R_COMP_RERENDER0x1
/* r->stamp */
#define R_STAMP_TIME 0x0001
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-03-21 17:13:35 UTC (rev 14201)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-03-21 17:37:24 UTC (rev 14202)
@@ -2156,30 +2156,30 @@
ntreeCompositTagAnimated(ntree);
}
- if(ntree && re->r.scemode & R_DOCOMP) {
- /* checks if there are render-result nodes that need
scene */
- if((re->r.scemode & R_SINGLE_LAYER)==0)
- ntree_render_scenes(re);
-
- if(!re->test_break()) {
- ntree->stats_draw= render_composit_stats;
- ntree->test_break= re->test_break;
- /* in case it was never initialized */
- R.stats_draw= re->stats_draw;
+ if(!(re->r.scemode & R_COMP_RERENDER)) {
+ if(ntree && re->r.scemode & R_DOCOMP) {
+ /* checks if there are render-result nodes that
need scene */
+ if((re->r.scemode & R_SINGLE_LAYER)==0)
+ ntree_render_scenes(re);
- if(re->r.scemode & R_FULL_SAMPLE)
- do_merge_fullsample(re, ntree);
- else
- ntreeCompositExecTree(ntree, &re->r,
G.background==0);
-
- ntree->stats_draw= NULL;
- ntree->test_break= NULL;
+ if(!re->test_break()) {
+ ntree->stats_draw=
render_composit_stats;
+ ntree->test_break= re->test_break;
+ /* in case it was never initialized */
+ R.stats_draw= re->stats_draw;
+
+ if(re->r.scemode & R_FULL_SAMPLE)
+ do_merge_fullsample(re, ntree);
+ else
+ ntreeCompositExecTree(ntree,
&re->r, G.background==0);
+
+ ntree->stats_draw= NULL;
+ ntree->test_break= NULL;
+ }
}
+ else if(re->r.scemode & R_FULL_SAMPLE)
+ do_merge_fullsample(re, NULL);
}
- else
- if(re->r
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14201] trunk/blender/source/blender/src: use Z depth for the ortho border zoom also, if there is no depth values set then fallback to previous method
Revision: 14201
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14201
Author: campbellbarton
Date: 2008-03-21 18:13:35 +0100 (Fri, 21 Mar 2008)
Log Message:
---
use Z depth for the ortho border zoom also, if there is no depth values set
then fallback to previous method.
Modified Paths:
--
trunk/blender/source/blender/src/drawview.c
trunk/blender/source/blender/src/editview.c
Modified: trunk/blender/source/blender/src/drawview.c
===
--- trunk/blender/source/blender/src/drawview.c 2008-03-21 17:00:40 UTC (rev
14200)
+++ trunk/blender/source/blender/src/drawview.c 2008-03-21 17:13:35 UTC (rev
14201)
@@ -2894,20 +2894,17 @@
View3D *v3d= spacedata;
Base *base;
Scene *sce;
- short drawtype, zbuf, flag;
+ short zbuf, flag;
float glalphaclip;
/* temp set drawtype to solid */
/* Setting these temporarily is not nice */
- drawtype = v3d->drawtype;
zbuf = v3d->zbuf;
flag = v3d->flag;
glalphaclip = U.glalphaclip;
U.glalphaclip = 0.5; /* not that nice but means we wont zoom into
billboards */
v3d->flag &= ~V3D_SELECT_OUTLINE;
- if ((v3d->drawtype != OB_SOLID) && (v3d->drawtype != OB_TEXTURE))
- v3d->drawtype = OB_SOLID;
setwinmatrixview3d(sa->winx, sa->winy, NULL); /* 0= no pick rect */
setviewmatrixview3d(); /* note: calls where_is_object for camera... */
@@ -2985,7 +2982,6 @@
v3d->transp= FALSE;
}
- v3d->drawtype = drawtype;
v3d->zbuf = zbuf;
U.glalphaclip = glalphaclip;
v3d->flag = flag;
Modified: trunk/blender/source/blender/src/editview.c
===
--- trunk/blender/source/blender/src/editview.c 2008-03-21 17:00:40 UTC (rev
14200)
+++ trunk/blender/source/blender/src/editview.c 2008-03-21 17:13:35 UTC (rev
14201)
@@ -2188,68 +2188,76 @@
void view3d_border_zoom(void)
{
+ View3D *v3d = G.vd;
+
/* Zooms in on a border drawn by the user */
rcti rect;
short val;
float dvec[3], vb[2], xscale, yscale, scale;
+
/* SMOOTHVIEW */
float new_dist;
float new_ofs[3];
- val = get_border(&rect, 3); //box select input
+ /* ZBuffer depth vars */
+ bglMats mats;
+ float depth, depth_close= MAXFLOAT;
+ int had_depth = 0;
+ double cent[2], p[3];
+ int xs, ys;
+
+ /* Get the border input */
+ val = get_border(&rect, 3);
if(!val) return;
- if (G.vd->persp==1) { /* perspective */
- View3D *v3d = G.vd;
- bglMats mats;
- float depth, depth_close= MAXFLOAT;
- double cent[2], p[3], p_corner[3];
- int xs, ys, had_depth = 0;
-
- /* convert border to 3d coordinates */
- bgl_get_mats(&mats);
-
- draw_depth(curarea, (void *)v3d);
-
- /* force updating */
- if (v3d->depths) {
- had_depth = 1;
- v3d->depths->damaged = 1;
- }
-
- view3d_update_depths(v3d);
-
- /* Constrain rect to depth bounds */
- if (rect.xmin < 0) rect.xmin = 0;
- if (rect.ymin < 0) rect.ymin = 0;
- if (rect.xmax >= G.vd->depths->w) rect.xmax = G.vd->depths->w-1;
- if (rect.ymax >= G.vd->depths->h) rect.ymax =
G.vd->depths->h-1;
-
- for (xs=rect.xmin; xs < rect.xmax; xs++) {
- for (ys=rect.ymin; ys < rect.ymax; ys++) {
- depth=
v3d->depths->depths[ys*v3d->depths->w+xs];
- if(depth < v3d->depths->depth_range[1] && depth
> v3d->depths->depth_range[0]) {
- if (depth_close > depth) {
- depth_close = depth;
- }
+ /* Get Z Depths, needed for perspective, nice for ortho */
+ bgl_get_mats(&mats);
+ draw_depth(curarea, (void *)v3d);
+
+ /* force updating */
+ if (v3d->depths) {
+ had_depth = 1;
+ v3d->depths->damaged = 1;
+ }
+
+ view3d_update_depths(v3d);
+
+ /* Constrain rect to depth bounds */
+ if (rect.xmin < 0) rect.xmin = 0;
+ if (rect.ymin < 0) rect.ymin = 0;
+ if (rect.xmax >= v3d->depths->w) rect.xmax = v3d->depths->w-1;
+ if (rect.ymax >= v3d->depths->h) rect.ymax = v3d->depths->h-1;
+
+ /* Find the closest Z pixel */
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14200] branches/ndof: update to trunk r14199
Revision: 14200 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14200 Author: lukep Date: 2008-03-21 18:00:40 +0100 (Fri, 21 Mar 2008) Log Message: --- update to trunk r14199 Modified Paths: -- branches/ndof/SConstruct branches/ndof/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/ndof/extern/ffmpeg/SConscript branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp branches/ndof/intern/guardedalloc/intern/mallocn.c branches/ndof/po/it.po branches/ndof/release/scripts/flt_defaultp.py branches/ndof/release/scripts/flt_import.py branches/ndof/release/scripts/flt_toolbar.py branches/ndof/source/blender/blenkernel/BKE_bad_level_calls.h branches/ndof/source/blender/blenkernel/BKE_bmesh.h branches/ndof/source/blender/blenkernel/BKE_collision.h branches/ndof/source/blender/blenkernel/BKE_particle.h branches/ndof/source/blender/blenkernel/BKE_sculpt.h branches/ndof/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/ndof/source/blender/blenkernel/intern/CCGSubSurf.c branches/ndof/source/blender/blenkernel/intern/action.c branches/ndof/source/blender/blenkernel/intern/armature.c branches/ndof/source/blender/blenkernel/intern/cloth.c branches/ndof/source/blender/blenkernel/intern/collision.c branches/ndof/source/blender/blenkernel/intern/curve.c branches/ndof/source/blender/blenkernel/intern/implicit.c branches/ndof/source/blender/blenkernel/intern/kdop.c branches/ndof/source/blender/blenkernel/intern/material.c branches/ndof/source/blender/blenkernel/intern/mesh.c branches/ndof/source/blender/blenkernel/intern/modifier.c branches/ndof/source/blender/blenkernel/intern/node.c branches/ndof/source/blender/blenkernel/intern/particle.c branches/ndof/source/blender/blenkernel/intern/particle_system.c branches/ndof/source/blender/blenkernel/intern/script.c branches/ndof/source/blender/blenkernel/intern/texture.c branches/ndof/source/blender/blenlib/BLI_arithb.h branches/ndof/source/blender/blenlib/intern/BLI_storage.h branches/ndof/source/blender/blenlib/intern/arithb.c branches/ndof/source/blender/blenlib/intern/threads.c branches/ndof/source/blender/blenloader/BLO_readfile.h branches/ndof/source/blender/blenloader/intern/readfile.c branches/ndof/source/blender/blenloader/intern/writefile.c branches/ndof/source/blender/imbuf/intern/tiff.c branches/ndof/source/blender/include/BIF_transform.h branches/ndof/source/blender/include/BSE_drawview.h branches/ndof/source/blender/include/BSE_edit.h branches/ndof/source/blender/makesdna/DNA_cloth_types.h branches/ndof/source/blender/makesdna/DNA_modifier_types.h branches/ndof/source/blender/makesdna/DNA_node_types.h branches/ndof/source/blender/makesdna/DNA_scene_types.h branches/ndof/source/blender/makesdna/DNA_view3d_types.h branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_math.c branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c branches/ndof/source/blender/python/BPY_extern.h branches/ndof/source/blender/python/BPY_interface.c branches/ndof/source/blender/python/api2_2x/Blender.c branches/ndof/source/blender/python/api2_2x/Constraint.c branches/ndof/source/blender/python/api2_2x/Draw.c branches/ndof/source/blender/python/api2_2x/Library.c branches/ndof/source/blender/python/api2_2x/Mesh.c branches/ndof/source/blender/python/api2_2x/Node.c branches/ndof/source/blender/python/api2_2x/Node.h branches/ndof/source/blender/python/api2_2x/SurfNurb.c branches/ndof/source/blender/python/api2_2x/Window.c branches/ndof/source/blender/python/api2_2x/doc/Constraint.py branches/ndof/source/blender/python/api2_2x/doc/Curve.py branches/ndof/source/blender/python/api2_2x/doc/IpoCurve.py branches/ndof/source/blender/python/api2_2x/doc/Mesh.py branches/ndof/source/blender/python/api2_2x/doc/Render.py branches/ndof/source/blender/python/api2_2x/sceneRender.c branches/ndof/source/blender/radiosity/intern/source/radrender.c branches/ndof/source/blender/render/intern/include/render_types.h branches/ndof/source/blender/render/intern/include/rendercore.h branches/ndof/source/blender/render/intern/source/convertblender.c branches/ndof/source/blender/render/intern/source/rayshade.c branches/ndof/source/blender/render/intern/source/shadeinput.c branches/ndof/source/blender/render/intern/source/texture.c branches/ndof/source/blender/src/butspace.c branches/ndof/source/blender/src/buttons_editing.c branches/ndof/source/blender/src/buttons_object.c branches/ndof/source/blender/src/drawaction.c branches/ndof/source/blender/src/drawipo.c branches/ndof/source/blender/src/drawnode.c branches/ndof/source/blender/src
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14199] trunk/blender/source/blender: make border zoom ignore backfaces in texture mode and zero alpha areas of billboards .
Revision: 14199 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14199 Author: campbellbarton Date: 2008-03-21 17:27:43 +0100 (Fri, 21 Mar 2008) Log Message: --- make border zoom ignore backfaces in texture mode and zero alpha areas of billboards. Modified Paths: -- trunk/blender/source/blender/makesdna/DNA_view3d_types.h trunk/blender/source/blender/src/drawview.c Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h === --- trunk/blender/source/blender/makesdna/DNA_view3d_types.h2008-03-21 16:10:53 UTC (rev 14198) +++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h2008-03-21 16:27:43 UTC (rev 14199) @@ -103,7 +103,7 @@ /** * The drawing mode for the 3d display. Set to OB_WIRE, OB_SOLID, -* OB_SHADED or OB_TEXTURED */ +* OB_SHADED or OB_TEXTURE */ short drawtype; short localview; int lay, layact; Modified: trunk/blender/source/blender/src/drawview.c === --- trunk/blender/source/blender/src/drawview.c 2008-03-21 16:10:53 UTC (rev 14198) +++ trunk/blender/source/blender/src/drawview.c 2008-03-21 16:27:43 UTC (rev 14199) @@ -2894,14 +2894,21 @@ View3D *v3d= spacedata; Base *base; Scene *sce; - short drawtype, zbuf; + short drawtype, zbuf, flag; + float glalphaclip; + /* temp set drawtype to solid */ - /* temp set drawtype to solid */ + /* Setting these temporarily is not nice */ drawtype = v3d->drawtype; zbuf = v3d->zbuf; - v3d->drawtype = OB_SOLID; + flag = v3d->flag; + glalphaclip = U.glalphaclip; - + U.glalphaclip = 0.5; /* not that nice but means we wont zoom into billboards */ + v3d->flag &= ~V3D_SELECT_OUTLINE; + if ((v3d->drawtype != OB_SOLID) && (v3d->drawtype != OB_TEXTURE)) + v3d->drawtype = OB_SOLID; + setwinmatrixview3d(sa->winx, sa->winy, NULL); /* 0= no pick rect */ setviewmatrixview3d(); /* note: calls where_is_object for camera... */ @@ -2980,6 +2987,8 @@ v3d->drawtype = drawtype; v3d->zbuf = zbuf; + U.glalphaclip = glalphaclip; + v3d->flag = flag; } static void draw_viewport_fps(ScrArea *sa); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14198] branches/ndof: updated blender buttons to trunk one
Revision: 14198
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14198
Author: lukep
Date: 2008-03-21 17:10:53 +0100 (Fri, 21 Mar 2008)
Log Message:
---
updated blender buttons to trunk one
Modified Paths:
--
branches/ndof/release/datafiles/blenderbuttons
branches/ndof/source/blender/src/blenderbuttons.c
Modified: branches/ndof/release/datafiles/blenderbuttons
===
(Binary files differ)
Modified: branches/ndof/source/blender/src/blenderbuttons.c
===
--- branches/ndof/source/blender/src/blenderbuttons.c 2008-03-21 15:31:02 UTC
(rev 14197)
+++ branches/ndof/source/blender/src/blenderbuttons.c 2008-03-21 16:10:53 UTC
(rev 14198)
@@ -1,1712 +1,2165 @@
/* DataToC output of file */
-int datatoc_blenderbuttons_size= 54583;
+int datatoc_blenderbuttons_size= 69070;
char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 2,
0, 0, 0, 1,
- 0, 8, 6, 0, 0, 0,197,144,206,103, 0, 0, 0, 25,116, 69, 88,116,
83,111,102,116,119, 97,114,101, 0, 71,114, 97,112,104,
-105, 99, 67,111,110,118,101,114,116,101,114, 53, 93, 72,238, 0, 0,212,217,
73, 68, 65, 84,120,156,236, 93, 9, 80, 20, 87, 26,
- 30, 80,163,163, 73,112, 52,137,199,232, 70, 99, 73, 98, 54, 30,129,245,
76,133, 34, 27, 77, 42, 88, 70, 93, 67, 34, 49,171,224,
- 21, 35,209,104, 65,240, 66, 65, 64, 84,144,251, 28,110, 4, 65, 33,
1,143,149, 13, 26, 60,136, 72,188, 83,229,170,171, 33, 30,
-235,134,178, 82,110,173,149,221,132,152,164,246,237,251,
27,222,240,104,250,120,221, 12, 51, 67,120, 83,245,213,244,244,116,255,
-243,191,243,251,254,255,117,247, 24, 38, 76,152,128, 56, 56, 56, 56, 56, 56,
56,186, 23, 12,142,118,128,131,131,131,131,131,131,
-195,126,248, 31,186, 47,188,115, 1,192,193,193,193,193,193,209, 13,193, 5,
0, 7, 7, 7, 7, 7, 71, 55, 4, 23, 0, 28, 28,
- 28, 28, 28, 28,221, 16, 92, 0,112,112,112,112,112,112,116, 67,180, 17, 0,
22,139,197,160, 23, 82,198,185, 61,110, 79, 1, 14,
-245,207,207,207, 79,241,123,103,175, 63,110, 15, 79, 94,
6,131,110,116,197,242,114,123,220,158, 22,123, 44,224, 2,160, 5,226,
- 9,194,217,252, 19,251,153,153,153,217,165, 9,204,226, 0, 1, 64,183, 47,
8,128, 25, 51,102, 88,209,213,234, 79,206,222,236,
- 57,239, 35, 37, 56,218, 63, 91,218,147, 34,118,163,169,
18,153,140,151,145,135,241, 2,114, 55, 70, 57,173, 0, 80,155, 99, 28,
-237, 31,183,215,245,237,177,128, 73, 0,216,146, 16,103,207,158,237, 77, 15,
68,248,236, 12, 21, 14,190,144,151,179, 10, 0,240,
-235,246,237,219, 2,212,132,138, 51,117, 88,169, 9,216, 34, 35, 0,128,152,
89, 65,151,159,165,125,203,202,202,172,128,243, 99,
- 98, 98,172, 16,139, 0,123,214,223,249,243,231, 17, 64,205, 6,125,156,156,
61, 32,121,165,200, 87,143,127, 98, 27,230,145,195,
- 5,244, 28,242, 36, 50,244,127,188, 25, 45,223,249,250,250,
42,250,231,249,141, 39,154,127,106,190, 38,200,217,107,235,151, 17,
-153, 86, 54, 32,163, 57,214,186,207,195, 24,139, 66,177, 16,176,152, 46,160,
40, 99,153,102, 1,128,203,226, 45, 46, 59,236,179,
-197,248,176,149, 0, 96,153,171, 88,237,117,102,121, 59,115,126,233,168,189,
33, 3,123,187,140, 30,252,148,235,239, 70, 12,115,
- 25,212,127, 96,143,126,189,123,185, 56,147,127,122,237,177, 64, 85, 0,
16,194,150, 35,106, 45, 5, 34,157,106,107, 89, 20,138,
-171, 79, 17,222,229, 38, 38,123, 87,120, 87, 16, 0,196, 79, 34, 2, 32, 11,
32,231,171,163, 59,172,168, 93,123,194, 54, 38,218,
-179, 0, 53, 1, 64, 19,117, 73, 73, 41, 42, 40, 44, 64, 89, 89, 89, 40, 53,
53, 21,197,199,199, 11,132, 45,238, 55,106, 4, 70,
-219,148, 18, 0, 98, 17, 96,207,250, 35,196,174, 38,120, 88, 4,
64,103,248,215,134, 20, 48,217,255, 11,213,161, 31,209, 29,244,
- 31, 84,130,190,201, 14, 70, 21,235, 3,152, 5, 0, 33,116, 86,176, 8,
0,163, 79, 40, 50, 91,110, 33,131,209, 36, 43,124,188,
-140,190,168, 6, 11,129, 11, 24, 44, 2, 64, 73, 68,217, 98,190,178,133, 0,
96, 17,118,172,246, 58,187,188,182,158, 95,108, 97,
-239,165,113, 19, 92, 50,222,152,219,107,251,251,203,250,228, 38,134,247, 45,
76, 74,239,151, 17,177,221,152, 31,145,247, 72,225,
-161, 35, 61, 52,140,143, 70, 86, 48,218, 11, 98,133,146, 61, 22,168, 10, 0,
97,242,220,188, 81,181,147,177,116, 48, 66,252,128,
- 13, 53,225, 86, 4,102,127,212,206,190,189, 59,132, 88, 0,168, 13, 4, 71,
14, 0, 90, 4,144,108,128, 51, 12, 40,218,191,227,
-199,143, 11,104,241, 13, 20,245,208, 22, 17,112,158, 85,
0,148,148,148,160,130,130, 66, 73,242, 7, 34,212, 42, 0,232,118, 20,
- 47, 1,116, 68, 0,176, 76,196,106,246,192,159,252,252,252,118, 32,153,
14,226,179, 22,255,180, 44, 7,168,213, 31, 68,252, 64,
-254,132,236,129,248,209,253,244, 54,228,207, 42, 0,200,139,165,223,169, 9,
0,115, 89, 29, 50,197, 86,171,174,249,155, 76, 38,
-228,229,229,133,234, 76,213,170, 2, 64,169, 61,229,190,179,119,127, 97,
33,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14197] branches/ndof/source/blender/src/ header_view3d.c: corrected minor error of the merge
Revision: 14197 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14197 Author: lukep Date: 2008-03-21 16:31:02 +0100 (Fri, 21 Mar 2008) Log Message: --- corrected minor error of the merge object center button was duplicated Modified Paths: -- branches/ndof/source/blender/src/header_view3d.c Modified: branches/ndof/source/blender/src/header_view3d.c === --- branches/ndof/source/blender/src/header_view3d.c2008-03-21 10:54:40 UTC (rev 14196) +++ branches/ndof/source/blender/src/header_view3d.c2008-03-21 15:31:02 UTC (rev 14197) @@ -5606,13 +5606,6 @@ xco+= XIC+8; - uiDefIconButBitS(block, TOG, V3D_ALIGN, B_AROUND, ICON_ALIGN, -xco,0,XIC,YIC, -&G.vd->flag, 0, 0, 0, 0, "Move object centers only"); - - xco+= XIC+8; - uiBlockEndAlign(block); - uiBlockBeginAlign(block); /* NDOF */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14196] trunk/blender/source/blender/src/ editseq.c: == Sequencer ==
Revision: 14196
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14196
Author: schlaile
Date: 2008-03-21 11:54:40 +0100 (Fri, 21 Mar 2008)
Log Message:
---
== Sequencer ==
Forgot REDRAW in obscure cases...
Modified Paths:
--
trunk/blender/source/blender/src/editseq.c
Modified: trunk/blender/source/blender/src/editseq.c
===
--- trunk/blender/source/blender/src/editseq.c 2008-03-21 10:47:59 UTC (rev
14195)
+++ trunk/blender/source/blender/src/editseq.c 2008-03-21 10:54:40 UTC (rev
14196)
@@ -2374,8 +2374,9 @@
/* like duplicate, but only duplicate and cut overlapping strips,
* strips to the left of the cutframe are ignored and strips to the right are
moved into the new list */
-static void cut_seq_list(ListBase *old, ListBase *new, int cutframe)
+static int cut_seq_list(ListBase *old, ListBase *new, int cutframe)
{
+ int did_something = FALSE;
Sequence *seq, *seq_next;
seq= old->first;
@@ -2391,6 +2392,7 @@
if (seqn) {
BLI_addtail(new, seqn);
}
+ did_something = TRUE;
} else if (seq->enddisp <= cutframe) {
/* do nothing */
} else if (seq->startdisp >= cutframe) {
@@ -2401,6 +2403,7 @@
}
seq = seq_next;
}
+ return did_something;
}
void seq_cut(int cutframe)
@@ -2408,14 +2411,16 @@
Editing *ed;
ListBase newlist;
char side;
+ int did_something;
+
ed= G.scene->ed;
if(ed==0) return;
newlist.first= newlist.last= NULL;
- cut_seq_list(ed->seqbasep, &newlist, cutframe);
+ did_something = cut_seq_list(ed->seqbasep, &newlist, cutframe);
- if (newlist.first) { /* simple check to see if anything was done */
+ if (newlist.first) { /* got new strips ? */
Sequence *seq;
addlisttolist(ed->seqbasep, &newlist);
@@ -2438,7 +2443,8 @@
/* as last: */
sort_seq();
-
+ }
+ if (did_something) {
allqueue(REDRAWSEQ, 0);
BIF_undo_push("Cut Strips, Sequencer");
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14195] trunk/blender/source/blender/src: == Sequencer ==
Revision: 14195
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14195
Author: schlaile
Date: 2008-03-21 11:47:59 +0100 (Fri, 21 Mar 2008)
Log Message:
---
== Sequencer ==
Reworked seq_cut completely. Now it is equivalent to: dup and set startofs /
endofs, which is what most people probably expected...
Fixes:
[#8388] Sequencer Cut on empty meta
[#8546] Sequencer: 2 different problems cutting some metastrips
Modified Paths:
--
trunk/blender/source/blender/src/editseq.c
trunk/blender/source/blender/src/seqaudio.c
Modified: trunk/blender/source/blender/src/editseq.c
===
--- trunk/blender/source/blender/src/editseq.c 2008-03-21 09:46:37 UTC (rev
14194)
+++ trunk/blender/source/blender/src/editseq.c 2008-03-21 10:47:59 UTC (rev
14195)
@@ -176,7 +176,7 @@
/* seq funcs's for transforming internally
notice the difference between start/end and left/right.
- left and right are the bounds at which the setuence is rendered,
+ left and right are the bounds at which the sequence is rendered,
start and end are from the start and fixed length of the sequence.
*/
int seq_tx_get_start(Sequence *seq) {
@@ -2245,6 +2245,22 @@
return seqn;
}
+static Sequence * deep_dupli_seq(Sequence * seq)
+{
+ Sequence * seqn = dupli_seq(seq);
+ if (seq->type == SEQ_META) {
+ Sequence * s;
+ for(s= seq->seqbase.first; s; s = s->next) {
+ Sequence * n = deep_dupli_seq(s);
+ if (n) {
+ BLI_addtail(&seqn->seqbase, n);
+ }
+ }
+ }
+ return seqn;
+}
+
+
static void recurs_dupli_seq(ListBase *old, ListBase *new)
{
Sequence *seq;
@@ -2271,15 +2287,97 @@
}
}
+static Sequence * cut_seq(Sequence * seq, int cutframe)
+{
+ TransSeq ts;
+ Sequence *seqn = 0;
+ int skip_dup = FALSE;
+
+ /* backup values */
+ ts.start= seq->start;
+ ts.machine= seq->machine;
+ ts.startstill= seq->startstill;
+ ts.endstill= seq->endstill;
+ ts.startdisp= seq->startdisp;
+ ts.enddisp= seq->enddisp;
+ ts.startofs= seq->startofs;
+ ts.endofs= seq->endofs;
+ ts.len= seq->len;
+
+ /* First Strip! */
+ /* strips with extended stillfames before */
+
+ if ((seq->startstill) && (cutframe start)) {
+ /* don't do funny things with METAs ... */
+ if (seq->type == SEQ_META) {
+ skip_dup = TRUE;
+ seq->startstill = seq->start - cutframe;
+ } else {
+ seq->start= cutframe -1;
+ seq->startstill= cutframe -seq->startdisp -1;
+ seq->endofs = seq->len - 1;
+ seq->endstill= 0;
+ }
+ }
+ /* normal strip */
+ else if ((cutframe >=seq->start)&&(cutframe <=(seq->start+seq->len))) {
+ seq->endofs = (seq->start+seq->len) - cutframe;
+ }
+ /* strips with extended stillframes after */
+ else if (((seq->start+seq->len) < cutframe) && (seq->endstill)) {
+ seq->endstill -= seq->enddisp - cutframe;
+ /* don't do funny things with METAs ... */
+ if (seq->type == SEQ_META) {
+ skip_dup = TRUE;
+ }
+ }
+
+ calc_sequence(seq);
+
+ if (!skip_dup) {
+ /* Duplicate AFTER the first change */
+ seqn = deep_dupli_seq(seq);
+ }
+
+ if (seqn) { /* should never fail */
+ seqn->flag |= SELECT;
+
+ /* Second Strip! */
+ /* strips with extended stillframes before */
+ if ((seqn->startstill) && (cutframe == seqn->start + 1)) {
+ seqn->start = ts.start;
+ seqn->startstill= ts.start- cutframe;
+ seqn->endofs = ts.endofs;
+ seqn->endstill = ts.endstill;
+ }
+
+ /* normal strip */
+ else if
((cutframe>=seqn->start)&&(cutframe<=(seqn->start+seqn->len))) {
+ seqn->startstill = 0;
+ seqn->startofs = cutframe - ts.start;
+ seqn->endofs = ts.endofs;
+ seqn->endstill = ts.endstill;
+ }
+
+ /* strips with extended stillframes after */
+ else if (((seqn->start+seqn->len) < cutframe) &&
(seqn->endstill)) {
+ seqn->start = cutframe - ts.len +1;
+ seqn->startofs = ts.len-1;
+ seqn->endstill = ts.enddisp - cutframe -1;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14194] trunk/blender/source/blender/src: Two changes:
Revision: 14194
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14194
Author: aligorith
Date: 2008-03-21 10:46:37 +0100 (Fri, 21 Mar 2008)
Log Message:
---
Two changes:
* Attempted fix for bug #8599c (inserting new keyframes mucked up existing
IPO-Keys). Now it calls make_ipokey() regardless of whether they exist already
(if ipokeys are being shown in the IPO-Editor). This might be a bit slower on
some files.
* 'Auto-Sync PoseLib' button is now only visible when there's a PoseLib
Modified Paths:
--
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/drawipo.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===
--- trunk/blender/source/blender/src/buttons_editing.c 2008-03-21 03:08:04 UTC
(rev 14193)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-03-21 09:46:37 UTC
(rev 14194)
@@ -5249,10 +5249,10 @@
std_libbuttons(block, 143, 130, 0, NULL,
B_POSELIB_BROWSE, ID_AC, 0, (ID *)act, (ID *)ob, &(G.buts->menunr),
B_POSELIB_ALONE, 0, B_POSELIB_DELETE, 0, 0);
uiBlockSetCol(block, TH_AUTO);
- uiDefBut(block, BUT, B_POSELIB_VALIDATE, "Auto-Sync
PoseLib", xco,110,160,20, 0, 0, 0, 0, 0, "Syncs the current PoseLib with the
poses available");
-
/* PoseLib - Pose editing controls */
if (act) {
+ uiDefBut(block, BUT, B_POSELIB_VALIDATE,
"Auto-Sync PoseLib", xco,110,160,20, 0, 0, 0, 0, 0, "Syncs the current PoseLib
with the poses available");
+
uiBlockBeginAlign(block);
/* currently 'active' pose */
if (act->markers.first) {
Modified: trunk/blender/source/blender/src/drawipo.c
===
--- trunk/blender/source/blender/src/drawipo.c 2008-03-21 03:08:04 UTC (rev
14193)
+++ trunk/blender/source/blender/src/drawipo.c 2008-03-21 09:46:37 UTC (rev
14194)
@@ -2220,8 +2220,9 @@
/* ipokeys */
if(sipo->showkey) {
- if(sipo->ipokey.first==0) make_ipokey();
- else update_ipokey_val();
+ //if(sipo->ipokey.first==0) make_ipokey();
+ //else update_ipokey_val();
+ make_ipokey();
draw_ipokey(sipo);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
