[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16222] trunk/blender/source/blender: Grease Pencil: WIP commit (nothing new)
Revision: 16222
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16222
Author: aligorith
Date: 2008-08-22 10:36:29 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Grease Pencil: WIP commit (nothing new)
Just a little commit so that I can transfer some changes back over to laptop.
* Line drawing should now be improved for most cases, but acute angles still
need more work to reduce 'shrinking' artifacts. As such, this is still hidden
behind 'rt' setting
* Preparation work for Grease-Pencil in Image Editor, and also 'Stick to View'
for Image/Sequence editors.
Modified Paths:
--
trunk/blender/source/blender/include/BDR_gpencil.h
trunk/blender/source/blender/include/BIF_drawgpencil.h
trunk/blender/source/blender/makesdna/DNA_gpencil_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/src/drawgpencil.c
trunk/blender/source/blender/src/gpencil.c
Modified: trunk/blender/source/blender/include/BDR_gpencil.h
===
--- trunk/blender/source/blender/include/BDR_gpencil.h 2008-08-22 06:02:01 UTC
(rev 16221)
+++ trunk/blender/source/blender/include/BDR_gpencil.h 2008-08-22 08:36:29 UTC
(rev 16222)
@@ -43,7 +43,6 @@
/* Temporary 'Stroke Point' data */
typedef struct tGPspoint {
short x, y; /* x and y coordinates of
cursor (in relative to area) */
- float xf, yf; /* same as x and y, but as floats */
float pressure; /* pressure of tablet at this point */
} tGPspoint;
Modified: trunk/blender/source/blender/include/BIF_drawgpencil.h
===
--- trunk/blender/source/blender/include/BIF_drawgpencil.h 2008-08-22
06:02:01 UTC (rev 16221)
+++ trunk/blender/source/blender/include/BIF_drawgpencil.h 2008-08-22
08:36:29 UTC (rev 16222)
@@ -28,15 +28,18 @@
#ifndef BIF_DRAWGPENCIL_H
#define BIF_DRAWGPENCIL_H
+
+struct bGPdata;
struct ScrArea;
struct View3D;
struct SpaceNode;
struct SpaceSeq;
-struct bGPdata;
struct uiBlock;
+struct ImBuf;
short draw_gpencil_panel(struct uiBlock *block, struct bGPdata *gpd, struct
ScrArea *sa);
+void draw_gpencil_2dimage(struct ScrArea *sa, struct ImBuf *ibuf);
void draw_gpencil_2dview(struct ScrArea *sa, short onlyv2d);
void draw_gpencil_3dview(struct ScrArea *sa, short only3d);
void draw_gpencil_oglrender(struct View3D *v3d, int winx, int winy);
Modified: trunk/blender/source/blender/makesdna/DNA_gpencil_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_gpencil_types.h 2008-08-22
06:02:01 UTC (rev 16221)
+++ trunk/blender/source/blender/makesdna/DNA_gpencil_types.h 2008-08-22
08:36:29 UTC (rev 16222)
@@ -59,8 +59,10 @@
#define GP_STROKE_3DSPACE (1<<0)
/* stroke is in 2d-space */
#define GP_STROKE_2DSPACE (1<<1)
+ /* stroke is in 2d-space (but with special 'image' scaling) */
+#define GP_STROKE_2DIMAGE (1<<2)
/* stroke is an "eraser" stroke */
-#define GP_STROKE_ERASER (1<<2)
+#define GP_STROKE_ERASER (1<<15)
/* Grease-Pencil Annotations - 'Frame'
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-08-22
06:02:01 UTC (rev 16221)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-08-22
08:36:29 UTC (rev 16222)
@@ -247,6 +247,7 @@
float xof, yof; /* user defined offset,
image is centered */
float centx, centy; /* storage for offset
while render drawing */
+ struct bGPdata *gpd;/* grease pencil data */
} SpaceImage;
typedef struct SpaceNla {
Modified: trunk/blender/source/blender/src/drawgpencil.c
===
--- trunk/blender/source/blender/src/drawgpencil.c 2008-08-22 06:02:01 UTC
(rev 16221)
+++ trunk/blender/source/blender/src/drawgpencil.c 2008-08-22 08:36:29 UTC
(rev 16222)
@@ -37,6 +37,9 @@
#include "MEM_guardedalloc.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
#include "BMF_Api.h"
#include "BLI_arithb.h"
@@ -317,6 +320,7 @@
GP_DRAWDATA_NOSTATUS= (1<<0), /* don't draw status info */
GP_DRAWDATA_ONLY3D = (1<<1), /* only draw 3d-strokes
*/
GP_DRAWDATA_ONLYV2D = (1<<2), /* only draw 'canvas'
strokes */
+ GP_DRAWDATA_ONLYI2D = (1<<3), /* only draw 'image'
strokes */
};
/* - Tool Buffer Drawing -- */
@@ -466,18 +470,22 @@
}
else { /* tesselation code:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16223] branches/fluidcontrol: svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 16223 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16223 Author: genscher Date: 2008-08-22 11:31:32 +0200 (Fri, 22 Aug 2008) Log Message: --- svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/fluidcontrol/CMakeLists.txt branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp branches/fluidcontrol/intern/guardedalloc/intern/mallocn.c branches/fluidcontrol/intern/guardedalloc/intern/mmap_win.c branches/fluidcontrol/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj branches/fluidcontrol/intern/guardedalloc/mmap_win.h branches/fluidcontrol/intern/opennl/make/msvc_7_0/opennl.vcproj branches/fluidcontrol/intern/opennl/superlu/smemory.c branches/fluidcontrol/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj branches/fluidcontrol/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/fluidcontrol/projectfiles_vc7/kernel/system/SYS_system.vcproj branches/fluidcontrol/release/VERSION branches/fluidcontrol/release/datafiles/datatoc.c branches/fluidcontrol/release/datafiles/splash.jpg branches/fluidcontrol/release/scripts/flt_properties.py branches/fluidcontrol/source/blender/blenkernel/BKE_blender.h branches/fluidcontrol/source/blender/blenkernel/BKE_collision.h branches/fluidcontrol/source/blender/blenkernel/BKE_customdata.h branches/fluidcontrol/source/blender/blenkernel/BKE_deform.h branches/fluidcontrol/source/blender/blenkernel/BKE_effect.h branches/fluidcontrol/source/blender/blenkernel/BKE_endian.h branches/fluidcontrol/source/blender/blenkernel/BKE_utildefines.h branches/fluidcontrol/source/blender/blenkernel/intern/CCGSubSurf.c branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c branches/fluidcontrol/source/blender/blenkernel/intern/bvhutils.c branches/fluidcontrol/source/blender/blenkernel/intern/cloth.c branches/fluidcontrol/source/blender/blenkernel/intern/collision.c branches/fluidcontrol/source/blender/blenkernel/intern/deform.c branches/fluidcontrol/source/blender/blenkernel/intern/displist.c branches/fluidcontrol/source/blender/blenkernel/intern/effect.c branches/fluidcontrol/source/blender/blenkernel/intern/icons.c branches/fluidcontrol/source/blender/blenkernel/intern/image.c branches/fluidcontrol/source/blender/blenkernel/intern/implicit.c branches/fluidcontrol/source/blender/blenkernel/intern/ipo.c branches/fluidcontrol/source/blender/blenkernel/intern/modifier.c branches/fluidcontrol/source/blender/blenkernel/intern/particle.c branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c branches/fluidcontrol/source/blender/blenkernel/intern/sca.c branches/fluidcontrol/source/blender/blenlib/BLI_editVert.h branches/fluidcontrol/source/blender/blenlib/BLI_rand.h branches/fluidcontrol/source/blender/blenlib/intern/BLI_ghash.c branches/fluidcontrol/source/blender/blenlib/intern/BLI_kdopbvh.c branches/fluidcontrol/source/blender/blenlib/intern/fileops.c branches/fluidcontrol/source/blender/blenlib/intern/psfont.c branches/fluidcontrol/source/blender/blenlib/intern/rand.c branches/fluidcontrol/source/blender/blenlib/intern/util.c branches/fluidcontrol/source/blender/blenloader/BLO_sys_types.h branches/fluidcontrol/source/blender/blenloader/intern/genfile.c branches/fluidcontrol/source/blender/blenloader/intern/readblenentry.c branches/fluidcontrol/source/blender/blenloader/intern/readfile.c branches/fluidcontrol/source/blender/blenloader/intern/writefile.c branches/fluidcontrol/source/blender/blenpluginapi/intern/pluginapi.c branches/fluidcontrol/source/blender/imbuf/intern/cineon/cineonlib.c branches/fluidcontrol/source/blender/imbuf/intern/cineon/dpxlib.c branches/fluidcontrol/source/blender/imbuf/intern/cineon/logImageCore.h branches/fluidcontrol/source/blender/imbuf/intern/cineon/logmemfile.c branches/fluidcontrol/source/blender/imbuf/intern/cineon/logmemfile.h branches/fluidcontrol/source/blender/imbuf/intern/scaling.c branches/fluidcontrol/source/blender/include/BDR_gpencil.h branches/fluidcontrol/source/blender/include/BIF_drawgpencil.h branches/fluidcontrol/source/blender/include/BIF_meshtools.h branches/fluidcontrol/source/blender/include/BIF_resources.h branches/fluidcontrol/source/blender/makesdna/DNA_gpencil_types.h branches/fluidcontrol/source/blender/makesdna/DNA_ipo_types.h branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h branches/fluidcontrol/source/blender/makesdna/DNA_object_force.h branches/fluidcontrol/source/blender/makesdna/DNA_particle_types.h branches/fluidcontrol/source/blender/makesdna/DNA_sensor_types.h branches/fluidcontrol/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16224] trunk/blender/source/blender/src/ gpencil.c: Compiling fix for last commit
Revision: 16224
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16224
Author: aligorith
Date: 2008-08-22 11:44:27 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Compiling fix for last commit
Modified Paths:
--
trunk/blender/source/blender/src/gpencil.c
Modified: trunk/blender/source/blender/src/gpencil.c
===
--- trunk/blender/source/blender/src/gpencil.c 2008-08-22 09:31:32 UTC (rev
16223)
+++ trunk/blender/source/blender/src/gpencil.c 2008-08-22 09:44:27 UTC (rev
16224)
@@ -821,14 +821,14 @@
}
}
break;
- case SPACE_SIMA:
+ case SPACE_IMAGE:
{
SpaceImage *sima= curarea->spacedata.first;
/* set the current area */
p->sa= curarea;
p->v2d= &sima->v2d;
- p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
+ //p->ibuf= BKE_image_get_ibuf(sima->image,
&sima->iuser);
}
break;
/* unsupported views */
___
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 [16225] trunk/blender/source/gameengine/ Converter/KX_ConvertActuators.cpp: BGE data conversion was making sound paths absolute, modify a copy rather
Revision: 16225
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16225
Author: campbellbarton
Date: 2008-08-22 12:27:16 +0200 (Fri, 22 Aug 2008)
Log Message:
---
BGE data conversion was making sound paths absolute, modify a copy rather then
the original.
Modified Paths:
--
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2008-08-22 09:44:27 UTC (rev 16224)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2008-08-22 10:27:16 UTC (rev 16225)
@@ -384,9 +384,13 @@
else
{
/* but we need
to convert the samplename into absolute pathname first */
-
BLI_convertstringcode(soundact->sound->name, maggiename);
- samplename =
soundact->sound->name;
+ char
fullpath[sizeof(soundact->sound->name)];
+ /* dont modify
soundact->sound->name, only change a copy */
+
BLI_strncpy(fullpath, soundact->sound->name, sizeof(fullpath));
+
BLI_convertstringcode(fullpath, maggiename);
+ samplename =
fullpath;
+
/* and now we
can load it */
if
(soundscene->LoadSample(samplename, NULL, 0) > -1)
sampleisloaded = true;
___
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 [16226] trunk/blender/source/blender/src/ drawgpencil.c: Grease Pencil - Drawing Improvements:
Revision: 16226
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16226
Author: aligorith
Date: 2008-08-22 13:46:59 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Grease Pencil - Drawing Improvements:
This commit finishes the work started in the previous commit.
1) Reduced the effects of 'shrinking' lines with acute angles (*)
2) Ends of strokes now get crude end-caps which look ok for most purposes (they
are really just simple trapeziums not fancy semicircles)
* Note: some shrinking does still occur if the stroke was drawn quickly enough
for few points to be recorded. Also, although there are still zones of
overlapping when there are acute angles, this is reduced to steeper angles (and
is not too bad considering real-life materials)
Modified Paths:
--
trunk/blender/source/blender/src/drawgpencil.c
Modified: trunk/blender/source/blender/src/drawgpencil.c
===
--- trunk/blender/source/blender/src/drawgpencil.c 2008-08-22 10:27:16 UTC
(rev 16225)
+++ trunk/blender/source/blender/src/drawgpencil.c 2008-08-22 11:46:59 UTC
(rev 16226)
@@ -450,7 +450,7 @@
static void gp_draw_stroke (bGPDspoint *points, int totpoints, short
thickness, short dflag, short sflag, short debug, int winx, int winy)
{
/* if thickness is less than 3, 'smooth' opengl lines look better */
- if ((thickness < 3) || (G.rt==0)) {
+ if (thickness < 3) {
bGPDspoint *pt;
int i;
@@ -472,19 +472,15 @@
bGPDspoint *pt1, *pt2;
float pm[2];
int i;
- short n;
glShadeModel(GL_FLAT);
+ glBegin(GL_QUADS);
- glPointSize(3.0f); // temp
-
- for (n= 0; n < 2; n++) { // temp
- glBegin((n)?GL_POINTS:GL_QUADS);
-
for (i=0, pt1=points, pt2=points+1; i < (totpoints-1); i++,
pt1++, pt2++) {
float s0[2], s1[2]; /* segment 'center'
points */
float t0[2], t1[2]; /* tesselated
coordinates */
float m1[2], m2[2]; /* gradient and normal
*/
+ float mt[2], sc[2]; /* gradient for
thickness, point for end-cap */
float pthick; /* thickness at segment
point */
/* get x and y coordinates from points */
@@ -502,42 +498,75 @@
/* calculate gradient and normal - 'angle'=(ny/nx) */
m1[1]= s1[1] - s0[1];
m1[0]= s1[0] - s0[0];
+ Normalize2(m1);
m2[1]= -m1[0];
m2[0]= m1[1];
- Normalize2(m2);
/* always use pressure from first point here */
pthick= (pt1->pressure * thickness);
/* if the first segment, start of segment is segment's
normal */
if (i == 0) {
- // TODO: also draw/do a round end-cap first
+ /* draw start cap first
+* - make points slightly closer to center
(about halfway across)
+*/
+ mt[0]= m2[0] * pthick * 0.5;
+ mt[1]= m2[1] * pthick * 0.5;
+ sc[0]= s0[0] - (m1[0] * pthick * 0.75);
+ sc[1]= s0[1] - (m1[1] * pthick * 0.75);
+ t0[0]= sc[0] - mt[0];
+ t0[1]= sc[1] - mt[1];
+ t1[0]= sc[0] + mt[0];
+ t1[1]= sc[1] + mt[1];
+
+ glVertex2fv(t0);
+ glVertex2fv(t1);
+
/* calculate points for start of segment */
- t0[0]= s0[0] - (pthick * m2[0]);
- t0[1]= s0[1] - (pthick * m2[1]);
- t1[0]= s0[0] + (pthick * m2[0]);
- t1[1]= s0[1] + (pthick * m2[1]);
+ mt[0]= m2[0] * pthick;
+ mt[1]= m2[1] * pthick;
- /* draw this line only once */
+ t0[0]= s0[0] - mt[0];
+ t0[1]= s0[1] - mt[1];
+ t1[0]= s0[
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16227] branches/apricot: Apricot Branch: svn merge -r 16194:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 16227 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16227 Author: blendix Date: 2008-08-22 13:51:56 +0200 (Fri, 22 Aug 2008) Log Message: --- Apricot Branch: svn merge -r 16194:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp branches/apricot/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/apricot/release/scripts/flt_properties.py branches/apricot/source/blender/blenkernel/BKE_deform.h branches/apricot/source/blender/blenkernel/BKE_effect.h branches/apricot/source/blender/blenkernel/intern/bvhutils.c branches/apricot/source/blender/blenkernel/intern/deform.c branches/apricot/source/blender/blenkernel/intern/effect.c branches/apricot/source/blender/blenkernel/intern/ipo.c branches/apricot/source/blender/blenkernel/intern/modifier.c branches/apricot/source/blender/blenkernel/intern/particle.c branches/apricot/source/blender/blenkernel/intern/particle_system.c branches/apricot/source/blender/blenlib/intern/BLI_kdopbvh.c branches/apricot/source/blender/blenloader/intern/readfile.c branches/apricot/source/blender/blenloader/intern/writefile.c branches/apricot/source/blender/include/BDR_gpencil.h branches/apricot/source/blender/include/BIF_drawgpencil.h branches/apricot/source/blender/makesdna/DNA_gpencil_types.h branches/apricot/source/blender/makesdna/DNA_ipo_types.h branches/apricot/source/blender/makesdna/DNA_modifier_types.h branches/apricot/source/blender/makesdna/DNA_object_force.h branches/apricot/source/blender/makesdna/DNA_particle_types.h branches/apricot/source/blender/makesdna/DNA_space_types.h branches/apricot/source/blender/python/api2_2x/Mesh.c branches/apricot/source/blender/python/api2_2x/Object.c branches/apricot/source/blender/python/api2_2x/doc/Object.py branches/apricot/source/blender/src/buttons_editing.c branches/apricot/source/blender/src/buttons_object.c branches/apricot/source/blender/src/drawgpencil.c branches/apricot/source/blender/src/editipo.c branches/apricot/source/blender/src/editipo_lib.c branches/apricot/source/blender/src/gpencil.c branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp branches/apricot/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp branches/apricot/source/gameengine/Ketsji/KX_Scene.h branches/apricot/source/gameengine/Physics/Bullet/CMakeLists.txt branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp branches/apricot/source/gameengine/Physics/Bullet/SConscript branches/apricot/source/gameengine/Physics/common/PHY_DynamicTypes.h branches/apricot/source/gameengine/PyDoc/GameLogic.py Added Paths: --- branches/apricot/release/scripts/flt_dofedit.py branches/apricot/release/scripts/flt_lodedit.py branches/apricot/source/blender/blenkernel/BKE_shrinkwrap.h branches/apricot/source/blender/blenkernel/intern/shrinkwrap.c Modified: branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp === --- branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-08-22 11:46:59 UTC (rev 16226) +++ branches/apricot/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp 2008-08-22 11:51:56 UTC (rev 16227) @@ -856,10 +856,26 @@ btScalar radius = coneShape->getRadius();//+coneShape->getMargin(); btScalar height = coneShape->getHeight();//+coneShape->getMargin(); btVector3 start = worldTransform.getOrigin(); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color); - getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color); - getDebugDraw
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16228] trunk/blender/source/blender: A bit of cleanup of warnings (gcc).
Revision: 16228
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16228
Author: aligorith
Date: 2008-08-22 14:10:02 +0200 (Fri, 22 Aug 2008)
Log Message:
---
A bit of cleanup of warnings (gcc).
Warnings still exist in the following places:
* places (exotic.c, etc.) where format strings still use 'longs' but datatype
is uintptr_t (i.e. resulting from the win64 changes)
* shrinkwrap.c - a few "incompatable type" warnings
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/python/api2_2x/Particle.c
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===
--- trunk/blender/source/blender/blenkernel/BKE_deform.h2008-08-22
11:51:56 UTC (rev 16227)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h2008-08-22
12:10:02 UTC (rev 16228)
@@ -38,6 +38,7 @@
struct Object;
struct ListBase;
struct bDeformGroup;
+struct MDeformVert;
void copy_defgroups (struct ListBase *lb1, struct ListBase *lb2);
struct bDeformGroup *copy_defgroup (struct bDeformGroup *ingroup);
Modified: trunk/blender/source/blender/python/api2_2x/Particle.c
===
--- trunk/blender/source/blender/python/api2_2x/Particle.c 2008-08-22
11:51:56 UTC (rev 16227)
+++ trunk/blender/source/blender/python/api2_2x/Particle.c 2008-08-22
12:10:02 UTC (rev 16228)
@@ -804,7 +804,7 @@
{
ParticleSystem *psys = 0L;
Object *ob = 0L;
- PyObject *partlist,*seglist;
+ PyObject *partlist,*seglist=0L;
ParticleCacheKey **cache,*path;
PyObject* loc = 0L;
ParticleKey state;
@@ -1107,7 +1107,7 @@
ParticleSystem *psys = 0L;
ParticleData *data;
Object *ob = 0L;
- PyObject *partlist,*tuple;
+ PyObject *partlist,*tuple=0L;
DerivedMesh* dm;
float vm[4][4],wm[4][4];
float size;
@@ -1217,7 +1217,7 @@
ParticleSystem *psys = 0L;
ParticleData *data;
Object *ob = 0L;
- PyObject *partlist,*tuple;
+ PyObject *partlist,*tuple=0L;
DerivedMesh* dm;
float vm[4][4],wm[4][4];
float life;
___
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 [16229] trunk/blender/release/text/ copyright.txt: Typo in copyright notice (VF -> BF)
Revision: 16229 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16229 Author: ton Date: 2008-08-22 14:48:12 +0200 (Fri, 22 Aug 2008) Log Message: --- Typo in copyright notice (VF -> BF) Modified Paths: -- trunk/blender/release/text/copyright.txt Modified: trunk/blender/release/text/copyright.txt === --- trunk/blender/release/text/copyright.txt2008-08-22 12:10:02 UTC (rev 16228) +++ trunk/blender/release/text/copyright.txt2008-08-22 12:48:12 UTC (rev 16229) @@ -56,7 +56,7 @@ information, claims of third parties, damages as a result of injury to any person, or any other loss) arising out of or in connection with the license granted under this License Agreement or the use of or inability - to use the Software, even if VF has been advised of the possibility of + to use the Software, even if BF has been advised of the possibility of such damages. 5. User warning and indemnification ___ 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 [16230] branches/soc-2008-unclezeiv/source /blender/render: Added indirect lighting generation for directional lights and environment maps (several is
Revision: 16230
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16230
Author: unclezeiv
Date: 2008-08-22 15:49:27 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Added indirect lighting generation for directional lights and environment maps
(several issues remaining)
Also:
- added API to retrieve bounding box of RE_ray_tree
- fixed subtle bug: bounce colour was erroneously computed as black for
surfaces facing away from camera; fixed by temporarily setting R_NOPUNOFLIP
before issuing shading call
Modified Paths:
--
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/raytrace.c
Modified:
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_raytrace.h
===
---
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_raytrace.h
2008-08-22 12:48:12 UTC (rev 16229)
+++
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_raytrace.h
2008-08-22 13:49:27 UTC (rev 16230)
@@ -110,5 +110,8 @@
end distance */
float RE_ray_tree_max_size(RayTree *tree);
+/* get the tree's axis aligned bounding box */
+void RE_ray_tree_aabb(RayTree *tree, float *min, float *max);
+
#endif /*__RE_RAYTRACE_H__*/
Modified:
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
===
--- branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-08-22 12:48:12 UTC (rev 16229)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-08-22 13:49:27 UTC (rev 16230)
@@ -175,6 +175,7 @@
int stat_discard_black;
int stat_discard_nan;
float scene_diag;
+ float scene_min[3], scene_max[3];
float indir_fac;
int do_indir;
int options;
@@ -210,6 +211,8 @@
#define IS_LEAF(node) (!(node)->child1 && !(node)->child2)
#define LC_LUMINOSITY_LIMIT (0.0001f)
+static void add_virtual_point_light(Render * re, LightcutsData *lcd, LampRen
*orig, float *col, int lev);
+
/* XXX: this function looks really slow! */
static float get_bounding_cone(LightcutsCluster * one, LightcutsCluster * two,
float *vec)
{
@@ -853,7 +856,7 @@
{
GroupObject *gonew;
LampRen *lar;
- int k, kk;
+ int k, kk, i;
float t, p, phi, phirad, st;
float maxc;
@@ -934,7 +937,18 @@
/* so that bright lights don't get excluded when n is
large */
lar->energy *= maxc;
}
+
+ /* indirect lighting */
+ for (i= 0; i < lcd->do_indir; i++) {
+ int lev= (lcd->options & LC_OPT_2ND_BOUNCE) ? 1 : 0;
+ add_virtual_point_light(re, lcd, lar, col, lev);
+ }
+ if (lcd->do_indir > 0 && (lcd->options & LC_OPT_ONLY_INDIR)) {
+ lamp_delete(lar);
+ continue;
+ }
+
BLI_addtail(&re->lampren, lar);
/* check deallocation */
gonew->lampren= lar;
@@ -1068,6 +1082,7 @@
GroupObject go;
float savecol[3], energy, max_col;
int max_idx;
+ int old_vlr_flag;
/* hack: increase current color/energy in order to avoid too dark
results */
energy= lar->energy;
@@ -1079,6 +1094,10 @@
lar->b /= lar->energy;
lar->energy= 1.0f;
+ /* don't do normal flipping in this phase */
+ old_vlr_flag= vla->flag;
+ vla->flag |= R_NOPUNOFLIP;
+
/* fake group object in order to use "light override" */
go.lampren= lar;
go.next= go.prev= 0x0;
@@ -1170,8 +1189,11 @@
lar->g= savecol[1];
lar->b= savecol[2];
+ /* restore VlakRen flags */
+ vla->flag= old_vlr_flag;
+
max_col= MAX3(shr.col[0], shr.col[1], shr.col[2]);
-
+
if (max_col==0.0f) {
lcd->stat_discard_black+= 1;
return 0.0f;
@@ -1195,19 +1217,39 @@
isec.mode= RE_RAY_MIRROR;
isec.faceorig= NULL;
isec.oborig= 0;
- VECCOPY(isec.start, orig->co);
- if (!(lcd->options & LC_OPT_FIXED_DIRS))
- get_cosine_weighted_random_direction(isec.vec);
- else {
- isec.vec[0]= 0.0f;
- isec.vec[1]= 0.0f;
- isec.vec[2]= 1.0f;
+ switch (orig->type) {
+ case LA_SPOT:
+ VECCOPY(isec.start, orig->co);
+ if (!(lcd->options & LC_OPT_FIXED_DIRS))
+ get_cosine_weighted_random_direction(isec.vec);
+ else {
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16231] trunk/blender: Fix Windows compilation problem and update MSVC project files
Revision: 16231 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16231 Author: ben2610 Date: 2008-08-22 17:00:30 +0200 (Fri, 22 Aug 2008) Log Message: --- Fix Windows compilation problem and update MSVC project files Modified Paths: -- trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj trunk/blender/source/blender/blenlib/BLI_winstuff.h trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp Modified: trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj === --- trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-22 13:49:27 UTC (rev 16230) +++ trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-22 15:00:30 UTC (rev 16231) @@ -495,6 +495,9 @@ RelativePath="..\..\..\source\blender\blenkernel\intern\script.c"> + + + + -#include // directory header for py function getBlendFileList +#ifndef WIN32 + #include +#else + #include "BLI_winstuff.h" +#endif #ifdef WIN32 #pragma warning (disable : 4786) ___ 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 [16232] branches/soc-2008-jaguarandi: svn merge -r 16215:16231 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 16232
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16232
Author: jaguarandi
Date: 2008-08-22 17:40:41 +0200 (Fri, 22 Aug 2008)
Log Message:
---
svn merge -r 16215:16231
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-jaguarandi/release/text/copyright.txt
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-jaguarandi/source/blender/include/BDR_gpencil.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_drawgpencil.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c
branches/soc-2008-jaguarandi/source/blender/src/drawgpencil.c
branches/soc-2008-jaguarandi/source/blender/src/gpencil.c
branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/GameLogic.py
Modified:
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===
---
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
2008-08-22 15:00:30 UTC (rev 16231)
+++
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
2008-08-22 15:40:41 UTC (rev 16232)
@@ -495,6 +495,9 @@
RelativePath="..\..\..\source\blender\blenkernel\intern\script.c">
+
+
+
+
origin),
obNode, DAG_RL_OB_DATA, "SimpleDeform Modifier");
}
-
/***/
static ModifierTypeInfo typeArr[NUM_MODIFIER_TYPES];
@@ -7733,7 +7732,6 @@
| eModifierTypeFlag_AcceptsCVs
| eModifierTypeFlag_SupportsEditmode
| eModifierTypeFlag_EnableInEditmode;
-
mti->initData = shrinkwrapModifier_initData;
mti->copyData = shrinkwrapModifier_copyData;
mti->requiredDataMask = shrinkwrapModifier_requiredDataMask;
@@ -7757,7 +7755,6 @@
mti->foreachObjectLink = simpledeformModifier_foreachObjectLink;
mti->updateDepgraph = simpledeformModifier_updateDepgraph;
-
typeArrInit = 0;
#undef INIT_TYPE
}
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
===
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-22 15:40:41 UTC (rev 16232)
@@ -63,7 +63,7 @@
#define OUT_OF_MEMORY()((void)printf("Shrinkwrap: Out of memory\n"))
/* Benchmark macros */
-#ifndef _WIN32
+#if !defined(_WIN32) && 0
#include
@@ -166,11 +166,6 @@
//TODO currently we need a copy in case
object_get_derived_final returns an emDM that does not defines getVertArray or
getFace array
calc.target = CDDM_copy( object_get_derived_final(smd->target,
CD_MASK_BAREMESH) );
- if(!calc.target)
- {
- printf("Target derived mesh is null! :S\n");
- }
-
//TODO there might be several "bugs" on non-uniform scales
matrixs.. because it will no longer be nearest surface, not sphere projection
//because space has been deformed
space_transform_setup(&calc.local2target, ob, smd->target);
@@ -182,12 +177,6 @@
//Projecting target defined - lets work!
if(calc.target)
{
-
- printf("Shrinkwrap (%s)%d over (%s)%d\n",
- calc.ob->id.name, calc.numVerts,
- calc.smd->target->id.name,
calc.target->getNumVerts(calc.target)
- );
-
switch(smd->shrinkType)
{
case MOD_SHRINKWRAP_NEAREST_SURFACE:
@@ -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16233] trunk/blender/source/blender: Removed cast warnings from shrinkwrap.c and BLI_kdopbvh.c
Revision: 16233
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16233
Author: jaguarandi
Date: 2008-08-22 20:28:34 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Removed cast warnings from shrinkwrap.c and BLI_kdopbvh.c
Only unused functions and openmp warnings left on those.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2008-08-22
15:40:41 UTC (rev 16232)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2008-08-22
18:28:34 UTC (rev 16233)
@@ -113,23 +113,23 @@
void space_transform_apply(const SpaceTransform *data, float *co)
{
- VecMat4MulVecfl(co, data->local2target, co);
+ VecMat4MulVecfl(co, ((SpaceTransform*)data)->local2target, co);
}
void space_transform_invert(const SpaceTransform *data, float *co)
{
- VecMat4MulVecfl(co, data->target2local, co);
+ VecMat4MulVecfl(co, ((SpaceTransform*)data)->target2local, co);
}
void space_transform_apply_normal(const SpaceTransform *data, float *no)
{
- Mat4Mul3Vecfl(data->local2target, no);
+ Mat4Mul3Vecfl( ((SpaceTransform*)data)->local2target, no);
Normalize(no); // TODO: could we just determine de scale value from the
matrix?
}
void space_transform_invert_normal(const SpaceTransform *data, float *no)
{
- Mat4Mul3Vecfl(data->target2local, no);
+ Mat4Mul3Vecfl(((SpaceTransform*)data)->target2local, no);
Normalize(no); // TODO: could we just determine de scale value from the
matrix?
}
@@ -291,7 +291,7 @@
space_transform_apply_normal( transf, tmp_no );
no = tmp_no;
- hit_tmp.dist *= Mat4ToScalef( transf->local2target );
+ hit_tmp.dist *= Mat4ToScalef(
((SpaceTransform*)transf)->local2target );
}
else
{
@@ -318,7 +318,7 @@
space_transform_invert( transf, hit_tmp.co );
space_transform_invert_normal( transf, hit_tmp.no );
- hit_tmp.dist = VecLenf( vert, hit_tmp.co );
+ hit_tmp.dist = VecLenf( (float*)vert, hit_tmp.co );
}
memcpy(hit, &hit_tmp, sizeof(hit_tmp) );
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-08-22
15:40:41 UTC (rev 16232)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-08-22
18:28:34 UTC (rev 16233)
@@ -82,7 +82,7 @@
typedef struct BVHNearestData
{
BVHTree *tree;
- float *co;
+ const float *co;
BVHTree_NearestPointCallback callback;
void*userdata;
float proj[13]; //coordinates projection over axis
@@ -1248,7 +1248,6 @@
static void dfs_find_nearest_begin(BVHNearestData *data, BVHNode *node)
{
- int i;
float nearest[3], sdist;
sdist = calc_nearest_point(data, node, nearest);
if(sdist >= data->nearest.dist) return;
___
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 [16234] branches/soc-2008-unclezeiv/source /blender/render/intern/source/lightcuts.c: Added indirect lighting generation for omnidirectional lights (
Revision: 16234
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16234
Author: unclezeiv
Date: 2008-08-22 22:03:33 +0200 (Fri, 22 Aug 2008)
Log Message:
---
Added indirect lighting generation for omnidirectional lights (this completes
support for the various light types but, again, several issues are still there)
Modified Paths:
--
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
Modified:
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
===
--- branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-08-22 18:28:34 UTC (rev 16233)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-08-22 20:03:33 UTC (rev 16234)
@@ -1071,6 +1071,19 @@
dir[1]= sinf(phi) * sin_th;
}
+static void get_random_direction(float *dir)
+{
+ float theta, phi, s;
+
+ theta= 2.0f * M_PI * BLI_frand();
+ phi= acosf(2.0f * BLI_frand() - 1.0f);
+ s= sinf(phi);
+
+ dir[0]= cosf(theta) * s;
+ dir[1]= sinf(theta) * s;
+ dir[2]= cosf(phi);
+}
+
/* XXX: terrible hack currently needed by get_bounce_color */
extern struct Render R;
@@ -1246,8 +1259,10 @@
}
break;
case LA_LOCAL:
- /* TODO: indirect lighting for omnidirectional lamps */
- return;
+ VECCOPY(isec.start, orig->co);
+ get_random_direction(isec.vec);
+ VECADDFAC(isec.end, isec.start, isec.vec, lcd->scene_diag);
+ break;
}
if (!RE_ray_tree_intersect(re->raytree, &isec)) {
___
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 [16235] branches/soc-2008-unclezeiv: svn merge -r 16179:16234 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 16235 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16235 Author: unclezeiv Date: 2008-08-22 22:17:39 +0200 (Fri, 22 Aug 2008) Log Message: --- svn merge -r 16179:16234 https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/soc-2008-unclezeiv/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/soc-2008-unclezeiv/release/scripts/flt_properties.py branches/soc-2008-unclezeiv/release/text/copyright.txt branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_deform.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_effect.h branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/bvhutils.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/deform.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/effect.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/implicit.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_winstuff.h branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_kdopbvh.c branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c branches/soc-2008-unclezeiv/source/blender/include/BDR_gpencil.h branches/soc-2008-unclezeiv/source/blender/include/BIF_drawgpencil.h branches/soc-2008-unclezeiv/source/blender/include/BIF_resources.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_gpencil_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_ipo_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_modifier_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_force.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_particle_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Mesh.c branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Particle.c branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Material.py branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Object.py branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c branches/soc-2008-unclezeiv/source/blender/src/drawipo.c branches/soc-2008-unclezeiv/source/blender/src/editipo.c branches/soc-2008-unclezeiv/source/blender/src/editipo_lib.c branches/soc-2008-unclezeiv/source/blender/src/gpencil.c branches/soc-2008-unclezeiv/source/blender/src/resources.c branches/soc-2008-unclezeiv/source/blender/src/space.c branches/soc-2008-unclezeiv/source/blender/src/usiblender.c branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.cpp branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.h branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.h branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/SConscript branches/soc-2008-unclezeiv/source/gameengine/Physics/common/PHY_DynamicTypes.h branches/soc-2008-unclezeiv/source/gameengine/P
