[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
André Pinto
andresusanopinto at gmail.com
Fri Aug 22 17:40:41 CEST 2008
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">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\shrinkwrap.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c">
</File>
<File
@@ -709,6 +712,9 @@
RelativePath="..\..\..\source\blender\blenkernel\BKE_script.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_softbody.h">
</File>
<File
Modified: branches/soc-2008-jaguarandi/release/text/copyright.txt
===================================================================
--- branches/soc-2008-jaguarandi/release/text/copyright.txt 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/release/text/copyright.txt 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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
Modified: branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_deform.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_deform.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_deform.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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: branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c 2008-08-22 15:40:41 UTC (rev 16232)
@@ -3,7 +3,7 @@
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
-* This program is free software; you can redistribute it and/orw
+* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
@@ -7405,7 +7405,6 @@
dag_add_relation(forest, dag_get_node(forest, smd->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 <sys/time.h>
@@ -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:
@@ -447,7 +436,7 @@
{
float *co = calc->vertexCos[i];
float tmp_co[3], tmp_no[3];
- float lim = 1000; //TODO: we should use FLT_MAX here, but sweepsphere code isnt prepared for that
+ float lim = 10000.0f; //TODO: we should use FLT_MAX here, but sweepsphere code isnt prepared for that
float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup);
if(weight == 0.0f) continue;
Modified: branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_winstuff.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_winstuff.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -61,6 +61,10 @@
// These definitions are also in arithb for simplicity
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
@@ -116,5 +120,9 @@
void get_default_root(char *root);
int check_file_chars(char *filename);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __WINSTUFF_H__ */
Modified: branches/soc-2008-jaguarandi/source/blender/include/BDR_gpencil.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/include/BDR_gpencil.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/include/BDR_gpencil.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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: branches/soc-2008-jaguarandi/source/blender/include/BIF_drawgpencil.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/include/BIF_drawgpencil.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/include/BIF_drawgpencil.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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: branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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: branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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: branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c 2008-08-22 15:00:30 UTC (rev 16231)
+++ branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c 2008-08-22 15:40:41 UTC (rev 16232)
@@ -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;
Modified: branches/soc-2008-jaguarandi/source/blender/src/drawgpencil.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list