[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16125] branches/soc-2008-jaguarandi/ source/blender: Simpledeform origin is no longer attache to parent by default
Revision: 16125
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16125
Author: jaguarandi
Date: 2008-08-15 02:51:44 +0200 (Fri, 15 Aug 2008)
Log Message:
---
Simpledeform origin is no longer attache to parent by default
That was due to a current limitation on dag system.. that leads to cyclic
dependencies.
So now you can attach the origin of a simpledeform to an empty and mark
whether its
affected by the relative position of empty or the global one.
brecht found a workarround to solve the cyclic dependency by
using a parent of both the mesh and the control empty:
empty_parent
|
|-> empty controlling simpledeform
|-> mesh with simpledeform modifier
Modified Paths:
--
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/simple_deform.c
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/simple_deform.c
===
---
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/simple_deform.c
2008-08-15 00:00:27 UTC (rev 16124)
+++
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/simple_deform.c
2008-08-15 00:51:44 UTC (rev 16125)
@@ -153,13 +153,24 @@
if(smd->origin)
{
//inverse is outdated
- Mat4Invert(smd->origin->imat, smd->origin->obmat);
- Mat4Invert(ob->imat, ob->obmat);
- ob2mod = tmp_matrix[0];
- mod2ob = tmp_matrix[1];
- Mat4MulSerie(ob2mod, smd->origin->imat, ob->obmat, 0, 0, 0, 0,
0, 0);
- Mat4Invert(mod2ob, ob2mod);
+ if(smd->originOpts & MOD_SIMPLEDEFORM_ORIGIN_LOCAL)
+ {
+ Mat4Invert(smd->origin->imat, smd->origin->obmat);
+ Mat4Invert(ob->imat, ob->obmat);
+
+ ob2mod = tmp_matrix[0];
+ mod2ob = tmp_matrix[1];
+ Mat4MulSerie(ob2mod, smd->origin->imat, ob->obmat, 0,
0, 0, 0, 0, 0);
+ Mat4Invert(mod2ob, ob2mod);
+ }
+ else
+ {
+ Mat4Invert(smd->origin->imat, smd->origin->obmat);
+ ob2mod = smd->origin->obmat;
+ mod2ob = smd->origin->imat;
+ }
+
}
Modified:
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
===
--- branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
2008-08-15 00:00:27 UTC (rev 16124)
+++ branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_modifier_types.h
2008-08-15 00:51:44 UTC (rev 16125)
@@ -544,7 +544,8 @@
char mode; /* deform function */
char axis; /* lock axis (for taper and
strech) */
- char pad[2];
+ char originOpts;/* originOptions */
+ char pad;
} SimpleDeformModifierData;
@@ -556,4 +557,8 @@
#define MOD_SIMPLEDEFORM_LOCK_AXIS_X (1<<0)
#define MOD_SIMPLEDEFORM_LOCK_AXIS_Y (1<<1)
+/* indicates whether simple deform should use the local
+ coordinates or global coordinates of origin */
+#define MOD_SIMPLEDEFORM_ORIGIN_LOCAL (1<<0)
+
#endif
Modified: branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
===
--- branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
2008-08-15 00:00:27 UTC (rev 16124)
+++ branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
2008-08-15 00:51:44 UTC (rev 16125)
@@ -1711,32 +1711,6 @@
return 0;
}
-static void modifier_link_new_empty(void *pp_empty, void *p_parent)
-{
- Object **empty = (Object**)pp_empty;
- Object *parent = (Object*) p_parent;
-
- /* Add object but witouth chaing layers and or changing active object */
- Base *base= BASACT, *newbase;
-
- (*empty) = add_object(OB_EMPTY);
-
- newbase= BASACT;
- newbase->lay= base->lay;
- (*empty)->lay= newbase->lay;
-
- /* restore, add_object sets active */
- BASACT= base;
-
- /* Makes parent relation and positions empty on center of object */
- (*empty)->partype= PAROBJECT;
- (*empty)->parent = parent;
- Mat4CpyMat4( (*empty)->obmat, parent->obmat );
- Mat4Invert( (*empty)->parentinv, parent->obmat);
- apply_obmat( (*empty) );
- DAG_scene_sort(G.scene);
-}
-
static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int
*xco, int *yco, int index, int cageIndex, int lastCageIndex)
{
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16124] branches/soc-2008-quorn: Merge from trunk 16031:16122
Revision: 16124 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16124 Author: quorn Date: 2008-08-15 02:00:27 +0200 (Fri, 15 Aug 2008) Log Message: --- Merge from trunk 16031:16122 Modified Paths: -- branches/soc-2008-quorn/release/VERSION branches/soc-2008-quorn/release/datafiles/splash.jpg branches/soc-2008-quorn/release/scripts/ply_export.py branches/soc-2008-quorn/source/blender/blenkernel/BKE_blender.h branches/soc-2008-quorn/source/blender/blenkernel/intern/bvhutils.c branches/soc-2008-quorn/source/blender/blenkernel/intern/softbody.c branches/soc-2008-quorn/source/blender/include/BIF_editarmature.h branches/soc-2008-quorn/source/blender/python/api2_2x/Texture.c branches/soc-2008-quorn/source/blender/python/api2_2x/doc/Render.py branches/soc-2008-quorn/source/blender/python/api2_2x/doc/Texture.py branches/soc-2008-quorn/source/blender/render/intern/source/rayshade.c branches/soc-2008-quorn/source/blender/src/buttons_logic.c branches/soc-2008-quorn/source/blender/src/editarmature.c branches/soc-2008-quorn/source/blender/src/editobject.c branches/soc-2008-quorn/source/blender/src/header_view3d.c branches/soc-2008-quorn/source/blender/src/splash.jpg.c branches/soc-2008-quorn/source/blender/src/transform_conversions.c branches/soc-2008-quorn/source/gameengine/Converter/BL_ActionActuator.cpp branches/soc-2008-quorn/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/soc-2008-quorn/source/gameengine/Converter/KX_ConvertActuators.cpp branches/soc-2008-quorn/source/gameengine/Expressions/InputParser.cpp branches/soc-2008-quorn/source/gameengine/Expressions/ListValue.cpp branches/soc-2008-quorn/source/gameengine/Expressions/PyObjectPlus.cpp branches/soc-2008-quorn/source/gameengine/Expressions/PyObjectPlus.h branches/soc-2008-quorn/source/gameengine/Expressions/Value.cpp branches/soc-2008-quorn/source/gameengine/Expressions/Value.h branches/soc-2008-quorn/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/soc-2008-quorn/source/gameengine/GameLogic/SCA_ILogicBrick.cpp branches/soc-2008-quorn/source/gameengine/GameLogic/SCA_PythonController.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/BL_Shader.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_CameraActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_CameraActuator.h branches/soc-2008-quorn/source/gameengine/Ketsji/KX_ConstraintActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_GameObject.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_GameObject.h branches/soc-2008-quorn/source/gameengine/Ketsji/KX_IpoActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_MeshProxy.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_ObjectActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_ParentActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_ParentActuator.h branches/soc-2008-quorn/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h branches/soc-2008-quorn/source/gameengine/Ketsji/KX_TrackToActuator.cpp branches/soc-2008-quorn/source/gameengine/Ketsji/KX_TrackToActuator.h branches/soc-2008-quorn/source/gameengine/Ketsji/KX_VehicleWrapper.cpp branches/soc-2008-quorn/source/gameengine/PyDoc/KX_CameraActuator.py branches/soc-2008-quorn/source/gameengine/PyDoc/KX_ParentActuator.py branches/soc-2008-quorn/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py branches/soc-2008-quorn/source/gameengine/PyDoc/KX_TrackToActuator.py branches/soc-2008-quorn/tools/btools.py Added Paths: --- branches/soc-2008-quorn/intern/bmfont/intern/BDF2BMF.py branches/soc-2008-quorn/release/text/release_247.txt Removed Paths: - branches/soc-2008-quorn/release/text/release_246.txt Copied: branches/soc-2008-quorn/intern/bmfont/intern/BDF2BMF.py (from rev 16122, trunk/blender/intern/bmfont/intern/BDF2BMF.py) === --- branches/soc-2008-quorn/intern/bmfont/intern/BDF2BMF.py (rev 0) +++ branches/soc-2008-quorn/intern/bmfont/intern/BDF2BMF.py 2008-08-15 00:00:27 UTC (rev 16124) @@ -0,0 +1,177 @@ +#!/usr/bin/python + +# * BEGIN GPL LICENSE BLOCK * +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free S
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16123] branches/harmonic-skeleton/source/ blender/src/autoarmature.c: Control bones support for root bones (didn' t work previously)
Revision: 16123
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16123
Author: theeth
Date: 2008-08-15 01:55:40 +0200 (Fri, 15 Aug 2008)
Log Message:
---
Control bones support for root bones (didn't work previously)
Preliminary support for multi threading. Fixed at 4 threads now, will make it
use the option eventually.
Need a better mecanism to wait for at least one finished threads.
Modified Paths:
--
branches/harmonic-skeleton/source/blender/src/autoarmature.c
Modified: branches/harmonic-skeleton/source/blender/src/autoarmature.c
===
--- branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-08-14 23:48:52 UTC (rev 16122)
+++ branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-08-14 23:55:40 UTC (rev 16123)
@@ -77,6 +77,9 @@
struct RigArc;
struct RigEdge;
+#define NB_THREADS 4
+#define USE_THREADS
+
typedef struct RigGraph {
ListBasearcs;
ListBasenodes;
@@ -94,6 +97,7 @@
ListBase controls;
ListBase threads;
+ char threads_used[NB_THREADS];
GHash *bones_map;
@@ -154,6 +158,7 @@
typedef struct RetargetParam {
RigGraph*rigg;
RigArc *iarc;
+ int index;
} RetargetParam;
typedef enum
@@ -258,7 +263,7 @@
rg->free_arc = RIG_freeRigArc;
rg->free_node = NULL;
- BLI_init_threads(&rg->threads, exec_retargetArctoArc, 2); /* fix number
of threads */
+ BLI_init_threads(&rg->threads, exec_retargetArctoArc, NB_THREADS); /*
fix number of threads */
return rg;
}
@@ -308,16 +313,24 @@
arc->head = node;
}
-static RigNode *newRigNodeTail(RigGraph *rg, RigArc *arc, float p[3])
+static RigNode *newRigNode(RigGraph *rg, float p[3])
{
RigNode *node;
node = MEM_callocN(sizeof(RigNode), "rig node");
BLI_addtail(&rg->nodes, node);
VECCOPY(node->p, p);
- node->degree = 1;
+ node->degree = 0;
node->arcs = NULL;
+ return node;
+}
+
+static RigNode *newRigNodeTail(RigGraph *rg, RigArc *arc, float p[3])
+{
+ RigNode *node = newRigNode(rg, p);
+
+ node->degree = 1;
arc->tail = node;
return node;
@@ -376,14 +389,18 @@
ctrl->bone = bone;
}
-static void RIG_parentControl(RigControl *ctrl, EditBone *parent)
+static int RIG_parentControl(RigControl *ctrl, EditBone *parent)
{
if (parent)
{
ctrl->parent = parent;
VecSubf(ctrl->offset, ctrl->bone->head, ctrl->parent->tail);
+
+ return 1;
}
+
+ return 0;
}
static void RIG_reconnectControlBones(RigGraph *rg)
@@ -431,8 +448,37 @@
/* if not found yet, check parent */
if (found == 0)
{
- RIG_parentControl(ctrl, ctrl->bone->parent);
+ found = RIG_parentControl(ctrl, ctrl->bone->parent);
}
+
+ /* if not found yet, check child */
+ if (found == 0)
+ {
+ RigArc *arc;
+ RigArc *best_arc = NULL;
+ EditBone *parent = NULL;
+
+ for (arc = rg->arcs.first; arc; arc = arc->next)
+ {
+ RigEdge *edge;
+ for (edge = arc->edges.first; edge; edge =
edge->next)
+ {
+ if (edge->bone && edge->bone->parent ==
ctrl->bone)
+ {
+ /* pick the bone on the arc
with the lowest symmetry level
+* means you connect control to
the trunk of the skeleton */
+ if (best_arc == NULL ||
arc->symmetry_level < best_arc->symmetry_level)
+ {
+ best_arc = arc;
+ parent = edge->bone;
+ }
+ }
+ }
+ }
+
+ found = RIG_parentControl(ctrl, parent);
+ }
+
}
}
@@ -488,9 +534,18 @@
nb_children = countEditBoneChildren(list, bone);
if (nb_children > 1)
{
- RigNode *end_node = newRigNodeTail(rg, arc, bone->tail);
+ RigNode *end_n
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16122] branches/harmonic-skeleton/source/ blender/blenlib: Add a function to join thread by index in the thread list.
Revision: 16122
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16122
Author: theeth
Date: 2008-08-15 01:48:52 +0200 (Fri, 15 Aug 2008)
Log Message:
---
Add a function to join thread by index in the thread list.
This can be safely merged in trunk, in case anyone needs something like that.
Modified Paths:
--
branches/harmonic-skeleton/source/blender/blenlib/BLI_threads.h
branches/harmonic-skeleton/source/blender/blenlib/intern/threads.c
Modified: branches/harmonic-skeleton/source/blender/blenlib/BLI_threads.h
===
--- branches/harmonic-skeleton/source/blender/blenlib/BLI_threads.h
2008-08-14 22:19:38 UTC (rev 16121)
+++ branches/harmonic-skeleton/source/blender/blenlib/BLI_threads.h
2008-08-14 23:48:52 UTC (rev 16122)
@@ -45,6 +45,7 @@
intBLI_available_thread_index(struct ListBase *threadbase);
void BLI_insert_thread (struct ListBase *threadbase, void *callerdata);
void BLI_remove_thread (struct ListBase *threadbase, void *callerdata);
+void BLI_remove_thread_index(struct ListBase *threadbase, int index);
void BLI_end_threads (struct ListBase *threadbase);
void BLI_lock_thread (int type);
Modified: branches/harmonic-skeleton/source/blender/blenlib/intern/threads.c
===
--- branches/harmonic-skeleton/source/blender/blenlib/intern/threads.c
2008-08-14 22:19:38 UTC (rev 16121)
+++ branches/harmonic-skeleton/source/blender/blenlib/intern/threads.c
2008-08-14 23:48:52 UTC (rev 16122)
@@ -199,6 +199,21 @@
}
}
+void BLI_remove_thread_index(ListBase *threadbase, int index)
+{
+ ThreadSlot *tslot;
+ int counter=0;
+
+ for(tslot = threadbase->first; tslot; tslot = tslot->next, counter++) {
+ if (counter == index && tslot->avail == 0) {
+ tslot->callerdata = NULL;
+ pthread_join(tslot->pthread, NULL);
+ tslot->avail = 1;
+ break;
+ }
+ }
+}
+
void BLI_end_threads(ListBase *threadbase)
{
ThreadSlot *tslot;
___
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 [16121] tags/blender-2-47-release/: Second part...
Revision: 16121 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16121 Author: bdiego Date: 2008-08-15 00:19:38 +0200 (Fri, 15 Aug 2008) Log Message: --- Second part... the new tags. Added Paths: --- tags/blender-2-47-release/ Copied: tags/blender-2-47-release (from rev 16120, branches/blender-2.47) ___ 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 [16120] tags/blender-2-47-release/: Part one..
Revision: 16120 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16120 Author: bdiego Date: 2008-08-15 00:15:10 +0200 (Fri, 15 Aug 2008) Log Message: --- Part one.. remove the old tags. Removed Paths: - tags/blender-2-47-release/ ___ 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 [16119] branches/blender-2.47/source/ blender: branches/blender-2.47
Revision: 16119
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16119
Author: bdiego
Date: 2008-08-15 00:03:14 +0200 (Fri, 15 Aug 2008)
Log Message:
---
branches/blender-2.47
Merge from trunk:
Revision: 16052
Revision: 16117
Two showstopper!!, now we are ready!
Modified Paths:
--
branches/blender-2.47/source/blender/render/intern/source/rayshade.c
branches/blender-2.47/source/blender/src/buttons_logic.c
Modified: branches/blender-2.47/source/blender/render/intern/source/rayshade.c
===
--- branches/blender-2.47/source/blender/render/intern/source/rayshade.c
2008-08-14 21:16:48 UTC (rev 16118)
+++ branches/blender-2.47/source/blender/render/intern/source/rayshade.c
2008-08-14 22:03:14 UTC (rev 16119)
@@ -263,7 +263,12 @@
shade_input_set_shade_texco(shi);
if(is->mode==RE_RAY_SHADOW_TRA)
- shade_color(shi, shr);
+ if(shi->mat->nodetree && shi->mat->use_nodes) {
+ ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
+ shi->mat= vlr->mat; /* shi->mat is being
set in nodetree */
+ }
+ else
+ shade_color(shi, shr);
else {
if(shi->mat->nodetree && shi->mat->use_nodes) {
ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
Modified: branches/blender-2.47/source/blender/src/buttons_logic.c
===
--- branches/blender-2.47/source/blender/src/buttons_logic.c2008-08-14
21:16:48 UTC (rev 16118)
+++ branches/blender-2.47/source/blender/src/buttons_logic.c2008-08-14
22:03:14 UTC (rev 16119)
@@ -1691,7 +1691,7 @@
uiDefBut(block, LABEL, 0, "Torque",
xco, yco-106, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque");
uiDefButF(block, NUM, 0, "",
xco+45, yco-106, wval, 19, oa->forcerot, -1.0, 1.0, 10, 0, "");
uiDefButF(block, NUM, 0, "",
xco+45+wval, yco-106, wval, 19, oa->forcerot+1, -1.0, 1.0, 10, 0, "");
- uiDefButF(block, NUM, 0, "",
xco+45+2*wval, yco-6106, wval, 19, oa->forcerot+2, -1.0, 1.0, 10, 0,
"");
+ uiDefButF(block, NUM, 0, "",
xco+45+2*wval, yco-106, wval, 19, oa->forcerot+2, -1.0, 1.0, 10, 0,
"");
}
if ( ob->gameflag & OB_DYNAMIC )
___
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 [16118] branches/harmonic-skeleton: merging trunk 15964 -> 16116
Revision: 16118 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16118 Author: theeth Date: 2008-08-14 23:16:48 +0200 (Thu, 14 Aug 2008) Log Message: --- merging trunk 15964 -> 16116 Modified Paths: -- branches/harmonic-skeleton/CMakeLists.txt branches/harmonic-skeleton/config/linux2-config.py branches/harmonic-skeleton/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj branches/harmonic-skeleton/projectfiles_vc7/blender/blender.sln branches/harmonic-skeleton/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj branches/harmonic-skeleton/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj branches/harmonic-skeleton/release/VERSION branches/harmonic-skeleton/release/datafiles/splash.jpg branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/collada.py branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/cstartup.py branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/helperObjects.py branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/translator.py branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/xmlUtils.py branches/harmonic-skeleton/release/scripts/flt_export.py branches/harmonic-skeleton/release/scripts/flt_palettemanager.py branches/harmonic-skeleton/release/scripts/import_dxf.py branches/harmonic-skeleton/release/scripts/ply_export.py branches/harmonic-skeleton/source/blender/blenkernel/BKE_blender.h branches/harmonic-skeleton/source/blender/blenkernel/BKE_texture.h branches/harmonic-skeleton/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/harmonic-skeleton/source/blender/blenkernel/intern/anim.c branches/harmonic-skeleton/source/blender/blenkernel/intern/modifier.c branches/harmonic-skeleton/source/blender/blenkernel/intern/particle_system.c branches/harmonic-skeleton/source/blender/blenkernel/intern/softbody.c branches/harmonic-skeleton/source/blender/blenkernel/intern/texture.c branches/harmonic-skeleton/source/blender/blenlib/BLI_kdopbvh.h branches/harmonic-skeleton/source/blender/blenlib/intern/BLI_kdopbvh.c branches/harmonic-skeleton/source/blender/include/BIF_editarmature.h branches/harmonic-skeleton/source/blender/include/BIF_editmesh.h branches/harmonic-skeleton/source/blender/include/butspace.h branches/harmonic-skeleton/source/blender/python/BPY_interface.c branches/harmonic-skeleton/source/blender/python/api2_2x/Blender.c branches/harmonic-skeleton/source/blender/python/api2_2x/Constraint.c branches/harmonic-skeleton/source/blender/python/api2_2x/Mathutils.c branches/harmonic-skeleton/source/blender/python/api2_2x/Mathutils.h branches/harmonic-skeleton/source/blender/python/api2_2x/Texture.c branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Render.py branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Texture.py branches/harmonic-skeleton/source/blender/render/intern/source/rayshade.c branches/harmonic-skeleton/source/blender/src/buttons_editing.c branches/harmonic-skeleton/source/blender/src/buttons_object.c branches/harmonic-skeleton/source/blender/src/editarmature.c branches/harmonic-skeleton/source/blender/src/editmesh_mods.c branches/harmonic-skeleton/source/blender/src/editobject.c branches/harmonic-skeleton/source/blender/src/header_view3d.c branches/harmonic-skeleton/source/blender/src/poselib.c branches/harmonic-skeleton/source/blender/src/splash.jpg.c branches/harmonic-skeleton/source/blender/src/transform_conversions.c branches/harmonic-skeleton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/harmonic-skeleton/source/gameengine/Converter/BL_ActionActuator.cpp branches/harmonic-skeleton/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/harmonic-skeleton/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertActuators.cpp branches/harmonic-skeleton/source/gameengine/Converter/KX_IpoConvert.cpp branches/harmonic-skeleton/source/gameengine/Expressions/InputParser.cpp branches/harmonic-skeleton/source/gameengine/Expressions/ListValue.cpp branches/harmonic-skeleton/source/gameengine/Expressions/PyObjectPlus.cpp branches/harmonic-skeleton/source/gameengine/Expressions/PyObjectPlus.h branches/harmonic-skeleton/source/gameengine/Expressions/Value.cpp branches/harmonic-skeleton/source/gameengine/Expressions/Value.h branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ILogicBrick.cpp branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_PythonController.cpp branches/harmonic-skeleton/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp branc
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16117] trunk/blender/source/blender/src/ buttons_logic.c: Fixing button placement typo reported by Carsten on mailing list
Revision: 16117 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16117 Author: theeth Date: 2008-08-14 21:16:55 +0200 (Thu, 14 Aug 2008) Log Message: --- Fixing button placement typo reported by Carsten on mailing list Modified Paths: -- trunk/blender/source/blender/src/buttons_logic.c Modified: trunk/blender/source/blender/src/buttons_logic.c === --- trunk/blender/source/blender/src/buttons_logic.c2008-08-14 17:36:08 UTC (rev 16116) +++ trunk/blender/source/blender/src/buttons_logic.c2008-08-14 19:16:55 UTC (rev 16117) @@ -1689,7 +1689,7 @@ uiDefBut(block, LABEL, 0, "Torque", xco, yco-106, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque"); uiDefButF(block, NUM, 0, "", xco+45, yco-106, wval, 19, oa->forcerot, -1.0, 1.0, 10, 0, ""); uiDefButF(block, NUM, 0, "", xco+45+wval, yco-106, wval, 19, oa->forcerot+1, -1.0, 1.0, 10, 0, ""); - uiDefButF(block, NUM, 0, "", xco+45+2*wval, yco-6106, wval, 19, oa->forcerot+2, -1.0, 1.0, 10, 0, ""); + uiDefButF(block, NUM, 0, "", xco+45+2*wval, yco-106, wval, 19, oa->forcerot+2, -1.0, 1.0, 10, 0, ""); } if ( ob->gameflag & OB_DYNAMIC ) ___ 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 [16116] branches/soc-2008-nicholasbishop/ source/blender: Added a Del Higher button to multires, removes levels higher than the currently selected one
Revision: 16116
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16116
Author: nicholasbishop
Date: 2008-08-14 19:36:08 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Added a Del Higher button to multires, removes levels higher than the currently
selected one.
Modified Paths:
--
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
Modified:
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
===
--- branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
2008-08-14 17:24:39 UTC (rev 16115)
+++ branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
2008-08-14 17:36:08 UTC (rev 16116)
@@ -30,7 +30,6 @@
struct DerivedMesh;
struct Mesh;
struct MFace;
-struct Multires;
struct Object;
typedef struct MultiresSubsurf {
@@ -43,8 +42,6 @@
int index;
} IndexNode;
-void multires_free(struct Multires*);
-
void create_vert_face_map(ListBase **map, IndexNode **mem, const struct MFace
*mface,
const int totvert, const int totface);
@@ -89,14 +86,14 @@
int x, y, ax, ay;
} MultiresDisplacer;
-void multires_load_old(struct DerivedMesh *, struct Multires *);
void multires_force_update(struct Object *ob);
struct DerivedMesh *multires_dm_create_from_derived(struct
MultiresModifierData*, struct DerivedMesh*,
struct Mesh *, int, int);
-int multiresModifier_switch_level(struct Object *ob, const int);
-void multiresModifier_join(struct Object *ob);
+int multiresModifier_switch_level(struct Object *, const int);
+void multiresModifier_join(struct Object *);
+void multiresModifier_del_levels(struct MultiresModifierData *, struct Object
*, int direction);
void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct
Object *ob, int distance,
int updateblock, int simple);
void multiresModifier_setLevel(void *mmd_v, void *ob_v);
@@ -110,3 +107,8 @@
void multires_displacer_anchor_vert(MultiresDisplacer *d, const int);
void multires_displacer_jump(MultiresDisplacer *d);
void multires_displace(MultiresDisplacer *d, float out[3]);
+
+/* Related to the old multires */
+struct Multires;
+void multires_load_old(struct DerivedMesh *, struct Multires *);
+void multires_free(struct Multires*);
Modified:
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
===
---
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-08-14 17:24:39 UTC (rev 16115)
+++
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-08-14 17:36:08 UTC (rev 16116)
@@ -758,6 +758,40 @@
mrdm->release(mrdm);
}
+/* direction=1 for delete higher, direction=0 for lower (not implemented yet)
*/
+void multiresModifier_del_levels(struct MultiresModifierData *mmd, struct
Object *ob, int direction)
+{
+ Mesh *me = get_mesh(ob);
+ int distance = mmd->totlvl - mmd->lvl;
+ MDisps *mdisps = CustomData_get_layer(&me->fdata, CD_MDISPS);
+
+ multires_force_update(ob);
+
+ if(mdisps && distance > 0 && direction == 1) {
+ int skip = multires_side_tot[distance] - 1;
+ int st = multires_side_tot[mmd->totlvl - 1];
+ int totdisp = multires_quad_tot[mmd->lvl - 1];
+ int i, j, x, y;
+
+ for(i = 0; i < me->totface; ++i) {
+ float (*disps)[3] = MEM_callocN(sizeof(float) * 3 *
totdisp, "multires del disps");
+
+ for(j = 0, y = 0; y < st; y += skip) {
+ for(x = 0; x < st; x += skip) {
+ VecCopyf(disps[j], mdisps[i].disps[y *
st + x]);
+ ++j;
+ }
+ }
+
+ MEM_freeN(mdisps[i].disps);
+ mdisps[i].disps = disps;
+ mdisps[i].totdisp = totdisp;
+ }
+ }
+
+ mmd->totlvl = mmd->lvl;
+}
+
void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int
distance, int updateblock, int simple)
{
DerivedMesh *final = NULL;
@@ -783,7 +817,7 @@
if(!mdisps)
mdisps = CustomData_add_layer(&me->fdata, CD_MDISPS,
CD_DEFAULT, NULL, me->totface);
- if(mdisps->disps && !updateblock) {
+ if(mdisps->disps && !updateblock && mmd->totlvl > 2) {
DerivedMesh *orig, *mrdm;
MultiresModifierData mmd_sub;
@@ -814,7 +848,7
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16115] branches/blender-2.47/source/ gameengine/Expressions/KX_Python.h: compatibility with py2.3 for GE
Revision: 16115
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16115
Author: lukep
Date: 2008-08-14 19:24:39 +0200 (Thu, 14 Aug 2008)
Log Message:
---
compatibility with py2.3 for GE
needed for os x
Modified Paths:
--
branches/blender-2.47/source/gameengine/Expressions/KX_Python.h
Modified: branches/blender-2.47/source/gameengine/Expressions/KX_Python.h
===
--- branches/blender-2.47/source/gameengine/Expressions/KX_Python.h
2008-08-14 17:12:40 UTC (rev 16114)
+++ branches/blender-2.47/source/gameengine/Expressions/KX_Python.h
2008-08-14 17:24:39 UTC (rev 16115)
@@ -51,5 +51,21 @@
#endif
#endif
+/*
+ Py_RETURN_NONE
+ Python 2.4 macro.
+ defined here until we switch to 2.4
+*/
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_BuildValue("O", Py_None)
+#endif
+#ifndef Py_RETURN_FALSE
+#define Py_RETURN_FALSE return PyBool_FromLong(0)
+#endif
+#ifndef Py_RETURN_TRUE
+#define Py_RETURN_TRUE return PyBool_FromLong(1)
+#endif
+
+
#endif // KX_PYTHON_H
___
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 [16114] branches/apricot/source/gameengine /Rasterizer/RAS_BucketManager.cpp: Apricot branch: a fix for flickering alpha, with multi-material
Revision: 16114
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16114
Author: blendix
Date: 2008-08-14 19:12:40 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Apricot branch: a fix for flickering alpha, with multi-material
objects. Note that sorting is only between polygons with the same
material, so which material draws first is still arbitrary, but
consistent.
Modified Paths:
--
branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp
Modified: branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp
===
--- branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp
2008-08-14 17:09:39 UTC (rev 16113)
+++ branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp
2008-08-14 17:12:40 UTC (rev 16114)
@@ -69,7 +69,7 @@
{
bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
{
- return a.m_z < b.m_z;
+ return (a.m_z < b.m_z) || (a.m_z == b.m_z && a.m_ms < b.m_ms);
}
};
@@ -77,7 +77,7 @@
{
bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
{
- return a.m_z > b.m_z;
+ return (a.m_z > b.m_z) || (a.m_z == b.m_z && a.m_ms > b.m_ms);
}
};
___
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 [16113] branches/soc-2008-quorn/source/ blender: Used the Python icon for the text plugin button and created an ON version.
Revision: 16113
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16113
Author: quorn
Date: 2008-08-14 19:09:39 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Used the Python icon for the text plugin button and created an ON version.
Modified Paths:
--
branches/soc-2008-quorn/source/blender/include/BIF_resources.h
branches/soc-2008-quorn/source/blender/src/blenderbuttons.c
branches/soc-2008-quorn/source/blender/src/header_text.c
branches/soc-2008-quorn/source/blender/src/space.c
Modified: branches/soc-2008-quorn/source/blender/include/BIF_resources.h
===
--- branches/soc-2008-quorn/source/blender/include/BIF_resources.h
2008-08-14 16:22:25 UTC (rev 16112)
+++ branches/soc-2008-quorn/source/blender/include/BIF_resources.h
2008-08-14 17:09:39 UTC (rev 16113)
@@ -108,7 +108,7 @@
ICON_FF,
ICON_REW,
ICON_PYTHON,
- ICON_BLANK11,
+ ICON_PYTHON_ON,
ICON_BLANK12,
ICON_BLANK13,
ICON_BLANK14,
Modified: branches/soc-2008-quorn/source/blender/src/blenderbuttons.c
===
--- branches/soc-2008-quorn/source/blender/src/blenderbuttons.c 2008-08-14
16:22:25 UTC (rev 16112)
+++ branches/soc-2008-quorn/source/blender/src/blenderbuttons.c 2008-08-14
17:09:39 UTC (rev 16113)
@@ -1,2128 +1,2133 @@
/* DataToC output of file */
-int datatoc_blenderbuttons_size= 67881;
+int datatoc_blenderbuttons_size= 68083;
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, 6, 98, 75, 71, 68,
- 0,255, 0,255, 0,255,160,189,167,147, 0, 0, 0, 9,112, 72, 89,115, 0,
0, 11, 19, 0, 0, 11, 19, 1, 0,154,156, 24, 0,
- 0, 0, 7,116, 73, 77, 69, 7,216, 7, 26, 14, 5, 6, 33,183, 35,115, 0,
0, 32, 0, 73, 68, 65, 84,120,218,236,125,121, 92,
- 84, 85,255,255,251,220,217,217, 23, 1, 21,133,193,125, 95,201, 37, 55, 40,
49, 51,205, 52,192,212, 36,219,196,210,180,178,180,
-111,249, 60,233, 79,159, 12,148,202,212,132,158, 74,179,210, 18,151,180, 92,
18,116, 80, 83, 82,209, 92,202, 5, 69, 1, 65,145,
-101, 86,102,187,115,231,222,223, 31, 51,131, 3, 2,179,128, 73,
61,243,126,113, 95,195, 93,230, 51,231,158,237,253,249,124,206,
-231,156, 67,250,245,235,199,193, 3, 15, 60,240,192, 3, 15, 60,248,159,
2,229,201, 2, 15, 60,240,192, 3, 15, 60,248,223,193,
-153,223,179, 1, 0,196,227, 1,240,192, 3, 15, 60,240,192, 3,143, 7,192,
3, 15, 60,240,192, 3, 15, 60,240, 40, 0, 30,120,
-224,129, 7, 30,120,224,129, 71, 1,240,192, 3, 15, 60,240,192, 3, 15,254,
17,224,219,159,156, 61,123,150,184, 43,168,190, 88,
- 2,143, 60,143,188,134,144,145,145,193,173,
95,191,254,129,165,111,234,212,169,220,150, 45, 91,136,167, 60,254,214,242,208,
4,
-121,240,228,159, 71,222, 63, 89,158,203, 10,192,255, 56,234,102,
32,105,201,233, 76, 79, 79,199,236,217,179,137,167,216,220, 47,
-227,184,184,184,154,243,172,172,172,127, 68, 94, 78,124, 42,185,209,142,
96,215,143, 25,255,232, 58, 35, 9,220, 9,177,161, 19,
-162, 64,163, 26,251,144,175, 95,220,146,235,162,167,253,122,208,114, 60,
0,127, 69,101,157, 56,113, 98,204,174, 93,187,100,118,
-231,177,187,118,237,202,105, 17, 45,146,179,244,157,132,180,216,118,201, 21,
22, 22, 2, 0,164, 82,233,223,169, 19,113, 90, 59,
-157, 58,117,170,211,207,110,217,178,197, 21,
69,141,219,186,117,107,205,201,206,157, 59, 17, 23, 23, 87,235,254,131, 82,
2,242,
-242,242, 56, 0,136,142,142, 38,205,241,220,174, 31, 51,238,107,249,133,
71,181, 7, 0,220, 49, 24,192,232,141,150,139, 74, 53,
- 0, 32, 33, 33, 1,153,153,153, 13,166,111, 96,193, 64,174,243,237,206,
46,253,248,247,195,191,119,162, 92, 36, 8,124,245, 2,
- 12,187,118, 66,161,152, 4, 5,128, 1,146,149, 88, 44, 57,141,246,
98,160,194, 80,128,197,250, 68,151,126, 55, 33, 33, 33, 38,
- 51, 51, 83, 86,231, 90,108,102,102,102, 78, 11,107, 91,205, 82,111,255,
38,239,219,236,104, 19, 44, 34, 62, 2,127, 98, 20, 11,
- 57,163, 82, 79, 85,235,213,172,214,104,250,159,152, 29,231, 80, 1,176,
18,182,237,179,169, 21,129,219,181,107, 23,150,110, 93,
- 14,159,246,254,168,190,169,194,251,137,139,101, 45,220,226,110, 73, 32,
82,169,148, 43, 44, 44, 68, 97, 97, 33,246,239,223,143,
-217,179,103,183, 84, 37,192,214,128, 72, 70, 70,134, 32, 57,
57,217,148,154,154,122, 10, 0, 22, 46, 92,248, 80, 99, 95,156, 52,
-105, 82,205,255, 12, 99, 6,109, 50,130, 54,210,160,105,203,193, 48, 12, 22,
46, 92,232, 82, 90,236,201,191, 62, 88,149, 1,238,
- 65,122, 2, 92, 81,126, 30,152,133, 31,224,135,243,215,191,135, 4,237,
96,198, 49,148,127,113, 6,231, 10,170, 48,249,195, 13,
- 78,125,189,243,237,206, 78, 18,186, 5,207,252,250,140,195, 60,145,140,
91,140,160,137, 47,162,244,245, 1,128, 94, 81,115,253,
-140,254,109,156, 1, 0, 61, 48, 82,146,128,131,12
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16112] branches/soc-2008-quorn/source/ blender: Got rid of the horrible blocking UI problems with Find and Replace by using a blockhandler panel .
Revision: 16112
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16112
Author: quorn
Date: 2008-08-14 18:22:25 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Got rid of the horrible blocking UI problems with Find and Replace by using a
blockhandler panel. The panel is shown when find is invoked with Alt F (or from
the menu). Successive presses of Alt F search again, while the panel is
visible. Alt H does the same for replace. (Ctrl F and Ctrl H also work - more
like other editors)
Modified Paths:
--
branches/soc-2008-quorn/source/blender/blenkernel/BKE_text.h
branches/soc-2008-quorn/source/blender/include/BIF_space.h
branches/soc-2008-quorn/source/blender/include/blendef.h
branches/soc-2008-quorn/source/blender/src/drawtext.c
branches/soc-2008-quorn/source/blender/src/header_text.c
Modified: branches/soc-2008-quorn/source/blender/blenkernel/BKE_text.h
===
--- branches/soc-2008-quorn/source/blender/blenkernel/BKE_text.h
2008-08-14 15:37:47 UTC (rev 16111)
+++ branches/soc-2008-quorn/source/blender/blenkernel/BKE_text.h
2008-08-14 16:22:25 UTC (rev 16112)
@@ -87,7 +87,7 @@
void txt_backspace_word (struct Text *text);
inttxt_add_char(struct Text *text, char add);
inttxt_replace_char(struct Text *text, char add);
-void txt_find_panel (struct SpaceText *st, int again, int flags);
+void find_and_replace(struct SpaceText *st, short mode);
void run_python_script (struct SpaceText *st);
intjumptoline_interactive (struct SpaceText *st);
void txt_export_to_object(struct Text *text);
@@ -153,11 +153,8 @@
#define UNDO_UNCOMMENT 035
/* Find and replace flags */
-#define TXT_FIND_REPLACE 0x01
+#define TXT_FIND_WRAP 0x01
#define TXT_FIND_ALLTEXTS 0x02
-#define TXT_FIND_WRAP 0x04
-#define TXT_FIND_MARKALL 0x08
-#define TXT_FIND_KEEP 0x10
/* Marker flags */
#define TMARK_TEMP 0x01/* Remove on non-editing events, don't
save */
Modified: branches/soc-2008-quorn/source/blender/include/BIF_space.h
===
--- branches/soc-2008-quorn/source/blender/include/BIF_space.h 2008-08-14
15:37:47 UTC (rev 16111)
+++ branches/soc-2008-quorn/source/blender/include/BIF_space.h 2008-08-14
16:22:25 UTC (rev 16112)
@@ -83,6 +83,9 @@
/* nodes handler codes */
#define NODES_HANDLER_GREASEPENCIL 80
+/* text handler codes */
+#define TEXT_HANDLER_FIND 90
+
/* theme codes */
#define B_ADD_THEME3301
#define B_DEL_THEME3302
Modified: branches/soc-2008-quorn/source/blender/include/blendef.h
===
--- branches/soc-2008-quorn/source/blender/include/blendef.h2008-08-14
15:37:47 UTC (rev 16111)
+++ branches/soc-2008-quorn/source/blender/include/blendef.h2008-08-14
16:22:25 UTC (rev 16112)
@@ -379,6 +379,11 @@
#define B_SYNTAX 509
#define B_WORDWRAP 510
#define B_TEXTPLUGINS 511
+#define B_PASTEFIND512
+#define B_PASTEREPLACE 513
+#define B_TEXTREPLACE 514
+#define B_TEXTFIND 515
+#define B_TEXTMARKALL 516
/* SCRIPT: 525 */
#define B_SCRIPTBROWSE 526
Modified: branches/soc-2008-quorn/source/blender/src/drawtext.c
===
--- branches/soc-2008-quorn/source/blender/src/drawtext.c 2008-08-14
15:37:47 UTC (rev 16111)
+++ branches/soc-2008-quorn/source/blender/src/drawtext.c 2008-08-14
16:22:25 UTC (rev 16112)
@@ -149,9 +149,9 @@
static void confirm_suggestion(Text *text, int skipleft);
#define TXT_MAXFINDSTR 255
-static int last_find_flags= TXT_FIND_WRAP | TXT_FIND_KEEP;
-static char *last_find_string= NULL;
-static char *last_repl_string= NULL;
+static int g_find_flags= TXT_FIND_WRAP;
+static char *g_find_str= NULL;
+static char *g_replace_str= NULL;
static int doc_scroll= 0;
static double last_check_time= 0;
@@ -217,8 +217,8 @@
void free_txt_data(void) {
txt_free_cut_buffer();
- if (last_find_string) MEM_freeN(last_find_string);
- if (last_repl_string) MEM_freeN(last_repl_string);
+ if (g_find_str) MEM_freeN(g_find_str);
+ if (g_replace_str) MEM_freeN(g_replace_str);
if (temp_char_buf) MEM_freeN(temp_char_buf);
if (temp_char_accum) MEM_freeN(temp_char_accum);
}
@@ -1458,6 +1458,163 @@
}
}
+static short check_blockhandler(SpaceText *st, short handler) {
+ short a;
+ for(a=0; ablockhandler[a]==handler) return 1;
+ return 0;
+}
+
+static void text_panel_find(short cntrl) // TEXT_HANDLER_FIND
+{
+ uiBlock *block;
+
+ if (!g_find_str || !g_replace_str) {
+ g_find_str= MEM_mal
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16110] branches/soc-2008-jaguarandi/ source/blender/blenkernel/intern/shrinkwrap.c: Fixed small bug ( introduced on last commit)
Revision: 16110
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16110
Author: jaguarandi
Date: 2008-08-14 16:42:16 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Fixed small bug (introduced on last commit)
Modified Paths:
--
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
===
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-14 09:36:29 UTC (rev 16109)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-14 14:42:16 UTC (rev 16110)
@@ -544,7 +544,7 @@
nearest.dist = FLT_MAX;
- //Find the nearest vertex
+ //Find the nearest vertex
#pragma omp parallel for default(none) private(i) firstprivate(nearest)
shared(calc,treeData) schedule(static)
for(i = 0; inumVerts; ++i)
{
@@ -570,7 +570,7 @@
BLI_bvhtree_find_nearest(treeData.tree, tmp_co, &nearest,
treeData.nearest_callback, &treeData);
//Found the nearest vertex
- if(nearest.index)
+ if(nearest.index != -1)
{
if(calc->smd->shrinkOpts &
MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE)
{
___
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 [16109] tags/blender-2-47-release/: Tagging for 2.47
Revision: 16109 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16109 Author: bdiego Date: 2008-08-14 11:36:29 +0200 (Thu, 14 Aug 2008) Log Message: --- Tagging for 2.47 Added Paths: --- tags/blender-2-47-release/ Copied: tags/blender-2-47-release (from rev 16108, branches/blender-2.47) ___ 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 [16107] branches/fluidcontrol/source/ blender: Bugfix for a) Fluid ipos gone after save-load b) changing viscosity causes fluidsim to be reversed [bot
Revision: 16107
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16107
Author: genscher
Date: 2008-08-14 11:19:41 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Bugfix for a) Fluid ipos gone after save-load b) changing viscosity causes
fluidsim to be reversed [both reported by broken] (at least 3 known bugs left)
Modified Paths:
--
branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
branches/fluidcontrol/source/blender/makesdna/DNA_object_fluidsim.h
branches/fluidcontrol/source/blender/src/buttons_object.c
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
===
--- branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
2008-08-14 09:18:57 UTC (rev 16106)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
2008-08-14 09:19:41 UTC (rev 16107)
@@ -181,7 +181,7 @@
// clmd->sim_parms->timescale= timescale;
// support reversing of baked fluid frames here
- if((fss->show_advancedoptions & OB_FLUIDSIM_REVERSE) &&
(fss->lastgoodframe >= 0))
+ if((fss->flag & OB_FLUIDSIM_REVERSE) && (fss->lastgoodframe >= 0))
{
framenr = fss->lastgoodframe - framenr + 1;
CLAMP(framenr, 1, fss->lastgoodframe);
Modified: branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
===
--- branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
2008-08-14 09:18:57 UTC (rev 16106)
+++ branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
2008-08-14 09:19:41 UTC (rev 16107)
@@ -3045,6 +3045,13 @@
act= act->next;
}
+ {
+ FluidsimModifierData *fluidmd =
(FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
+
+ if(fluidmd && fluidmd->fss)
+ fluidmd->fss->ipo = newlibadr_us(fd,
ob->id.lib, fluidmd->fss->ipo);
+ }
+
/* texture field */
if(ob->pd)
if(ob->pd->tex)
@@ -3121,7 +3128,6 @@
FluidsimModifierData *fluidmd = (FluidsimModifierData*)
md;
fluidmd->fss= newdataadr(fd, fluidmd->fss);
- fluidmd->fss->ipo = newlibadr_us(fd, lb,
fluidmd->fss->ipo);
}
else if (md->type==eModifierType_Collision) {
@@ -7794,6 +7800,7 @@
MEM_freeN(ob->fluidsimSettings);
fluidmd->fss->lastgoodframe = INT_MAX;
+ fluidmd->fss->flag = 0;
}
}
}
Modified: branches/fluidcontrol/source/blender/makesdna/DNA_object_fluidsim.h
===
--- branches/fluidcontrol/source/blender/makesdna/DNA_object_fluidsim.h
2008-08-14 09:18:57 UTC (rev 16106)
+++ branches/fluidcontrol/source/blender/makesdna/DNA_object_fluidsim.h
2008-08-14 09:19:41 UTC (rev 16107)
@@ -159,7 +159,7 @@
#define OB_FSPART_FLOAT (1<<4)
// new fluid bit flags for fss->flags - dg
-#define OB_FLUIDSIM_REVERSE 1
+#define OB_FLUIDSIM_REVERSE (1 << 0)
#ifdef __cplusplus
}
Modified: branches/fluidcontrol/source/blender/src/buttons_object.c
===
--- branches/fluidcontrol/source/blender/src/buttons_object.c 2008-08-14
09:18:57 UTC (rev 16106)
+++ branches/fluidcontrol/source/blender/src/buttons_object.c 2008-08-14
09:19:41 UTC (rev 16107)
@@ -2407,7 +2407,7 @@
case B_FLUIDSIM_CHANGETYPE:
{
FluidsimModifierData *fluidmd = (FluidsimModifierData
*)modifiers_findByType(ob, eModifierType_Fluidsim);
- fluidmd->fss->show_advancedoptions &= ~OB_FLUIDSIM_REVERSE; //
clear flag
+ fluidmd->fss->flag &= ~OB_FLUIDSIM_REVERSE; // clear flag
if(ob && ob->particlesystem.first &&
fluidmd->fss->type!=OB_FLUIDSIM_PARTICLE){
ParticleSystem *psys;
for(psys=ob->particlesystem.first; psys;
psys=psys->next) {
@@ -5185,7 +5185,7 @@
yline -= 1*separateHeight;
uiBlockBeginAlign ( block );
- uiDefButBitS ( block, TOG, OB_FLUIDSIM_REVERSE,
REDRAWBUTSOBJECT, "Reverse", 0, yline,50,objHeight, &fss->flag, 0, 0, 0, 0,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16106] branches/apricot: svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 16106 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16106 Author: campbellbarton Date: 2008-08-14 11:18:57 +0200 (Thu, 14 Aug 2008) Log Message: --- svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/apricot/release/VERSION branches/apricot/release/datafiles/splash.jpg branches/apricot/source/blender/blenkernel/BKE_blender.h branches/apricot/source/blender/src/splash.jpg.c branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp branches/apricot/source/gameengine/Expressions/InputParser.cpp branches/apricot/source/gameengine/Expressions/ListValue.cpp branches/apricot/source/gameengine/Expressions/PyObjectPlus.cpp branches/apricot/source/gameengine/Expressions/PyObjectPlus.h branches/apricot/source/gameengine/Expressions/Value.cpp branches/apricot/source/gameengine/Expressions/Value.h branches/apricot/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/apricot/source/gameengine/GameLogic/SCA_ILogicBrick.cpp branches/apricot/source/gameengine/Ketsji/BL_Shader.cpp branches/apricot/source/gameengine/Ketsji/KX_CameraActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_CameraActuator.h branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp branches/apricot/source/gameengine/Ketsji/KX_GameObject.h branches/apricot/source/gameengine/Ketsji/KX_IpoActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_MeshProxy.cpp branches/apricot/source/gameengine/Ketsji/KX_ObjectActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_ParentActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_ParentActuator.h branches/apricot/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp branches/apricot/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp branches/apricot/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h branches/apricot/source/gameengine/Ketsji/KX_TrackToActuator.cpp branches/apricot/source/gameengine/Ketsji/KX_TrackToActuator.h branches/apricot/source/gameengine/Ketsji/KX_VehicleWrapper.cpp branches/apricot/source/gameengine/PyDoc/KX_CameraActuator.py branches/apricot/source/gameengine/PyDoc/KX_ParentActuator.py branches/apricot/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py branches/apricot/source/gameengine/PyDoc/KX_TrackToActuator.py Added Paths: --- branches/apricot/release/text/release_247.txt Removed Paths: - branches/apricot/release/text/release_246.txt Modified: branches/apricot/release/VERSION === --- branches/apricot/release/VERSION2008-08-14 08:58:25 UTC (rev 16105) +++ branches/apricot/release/VERSION2008-08-14 09:18:57 UTC (rev 16106) @@ -1 +1 @@ -2.46 +2.47 Modified: branches/apricot/release/datafiles/splash.jpg === (Binary files differ) Deleted: branches/apricot/release/text/release_246.txt === --- branches/apricot/release/text/release_246.txt 2008-08-14 08:58:25 UTC (rev 16105) +++ branches/apricot/release/text/release_246.txt 2008-08-14 09:18:57 UTC (rev 16106) @@ -1,13 +0,0 @@ -- Blender 2.46 release - -May 2008 - -This is the release of version 2.46, the result of 9 months of development, -including everything as used to render the open movie Big Buck Bunny. - -For html versions of release logs, with images and examples, please check: -http://www.blender.org - -Have fun! - -The blender.org team. Copied: branches/apricot/release/text/release_247.txt (from rev 16105, trunk/blender/release/text/release_247.txt) === --- branches/apricot/release/text/release_247.txt (rev 0) +++ branches/apricot/release/text/release_247.txt 2008-08-14 09:18:57 UTC (rev 16106) @@ -0,0 +1,15 @@ +- Blender 2.47 release + +Aug 2008 + +This is the upgrade release of 2.47, it is a bugfix release to stabilize +the 2.4x series. No new feature have been added, but serious effort has +been put in tracking bugs and fixing them. Some performance issues have +also been addressed. + +For html versions of release logs, please check: +http://www.blender.org + +Have fun! + +
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16105] trunk/blender/source/gameengine: Python API get/setObject update for Actuators.
Revision: 16105
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16105
Author: campbellbarton
Date: 2008-08-14 10:58:25 +0200 (Thu, 14 Aug 2008)
Log Message:
---
Python API get/setObject update for Actuators. (SetParent, AddObject, Camera
and TrackTo)
* bugfix for BGE python api - SetParent actuator getObject would segfault if
the object was not set.
* Added utility function ConvertPythonToGameObject() that can take a
GameObject, string or None and set the game object from this since it was being
done in a number of places.
* allow setObject(None), since no object is valid for actuators, Python should
be able to set this.
* added optional argument for getObject() so it returns the KX_GameObject
rather then its name, would prefer this be default but it could break existing
games.
Modified Paths:
--
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
trunk/blender/source/gameengine/PyDoc/KX_CameraActuator.py
trunk/blender/source/gameengine/PyDoc/KX_ParentActuator.py
trunk/blender/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
trunk/blender/source/gameengine/PyDoc/KX_TrackToActuator.py
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2008-08-14 06:42:52 UTC (rev 16104)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2008-08-14 08:58:25 UTC (rev 16105)
@@ -540,9 +540,16 @@
// does the 'original' for
replication exists, and
// is it in a non-active layer ?
SCA_IObject* originalval = NULL;
- if (editobact->ob &&
!(editobact->ob->lay & activeLayerBitInfo))
- originalval =
converter->FindGameObject(editobact->ob);
-
+ if (editobact->ob)
+ {
+ if (editobact->ob->lay
& activeLayerBitInfo)
+ {
+ fprintf(stderr,
"Warning, object \"%s\" from AddObject actuator \"%s\" is not in a hidden
layer.\n", objectname.Ptr(), uniquename.Ptr());
+ }
+ else {
+ originalval =
converter->FindGameObject(editobact->ob);
+ }
+ }
MT_Vector3 linvelvec (
KX_BLENDERTRUNC(editobact->linVelocity[0]),
KX_BLENDERTRUNC(editobact->linVelocity[1]),
KX_BLENDERTRUNC(editobact->linVelocity[2]));
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
===
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2008-08-14
06:42:52 UTC (rev 16104)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2008-08-14
08:58:25 UTC (rev 16105)
@@ -121,6 +121,13 @@
}; \
static char method_name##_doc[]; \
+#define KX_PYMETHOD_DOC_VARARGS(class_name, method_name)
\
+ PyObject* Py##method_name(PyObject* self, PyObject* args); \
+ static PyObject* sPy##method_name( PyObject* self, PyObject* args) { \
+ return ((class_name*) self)->Py##method_name(self, args);
\
+ }; \
+static char method_name##_doc[]; \
+
#define KX_PYMETHOD_DOC_O(class_name, method_name) \
PyObject* Py##method_name(PyObject* self, PyObject* value); \
static PyObject* sPy##method_name( PyObject*
