[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15903] trunk/blender/source/blender: Ipo Editor would not allow access to either World or Lamp texture Ipos.
Revision: 15903
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15903
Author: harkyman
Date: 2008-08-01 14:56:29 +0200 (Fri, 01 Aug 2008)
Log Message:
---
Ipo Editor would not allow access to either World or Lamp texture Ipos. Now it
does. Fixes bug #17379.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_texture.h
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/src/editipo.c
trunk/blender/source/blender/src/header_ipo.c
Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===
--- trunk/blender/source/blender/blenkernel/BKE_texture.h 2008-08-01
02:25:21 UTC (rev 15902)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h 2008-08-01
12:56:29 UTC (rev 15903)
@@ -62,6 +62,7 @@
void make_local_texture(struct Tex *tex);
void autotexname(struct Tex *tex);
struct Tex *give_current_texture(struct Object *ob, int act);
+struct Tex *give_current_world_texture(void);
struct TexMapping *add_mapping(void);
void init_mapping(struct TexMapping *texmap);
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===
--- trunk/blender/source/blender/blenkernel/intern/texture.c2008-08-01
02:25:21 UTC (rev 15902)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c2008-08-01
12:56:29 UTC (rev 15903)
@@ -53,6 +53,7 @@
#include "DNA_world_types.h"
#include "DNA_brush_types.h"
#include "DNA_node_types.h"
+#include "DNA_scene_types.h"
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
@@ -731,7 +732,7 @@
bNode *node;
if(ob==0) return 0;
- if(ob->totcol==0) return 0;
+ if(ob->totcol==0 && !(ob->type==OB_LAMP)) return 0;
if(ob->type==OB_LAMP) {
la=(Lamp *)ob->data;
@@ -775,6 +776,18 @@
return tex;
}
+Tex *give_current_world_texture(void)
+{
+ MTex *mtex = 0;
+ Tex *tex = 0;
+
+ if(!(G.scene->world)) return 0;
+
+ mtex= G.scene->world->mtex[(int)(G.scene->world->texact)];
+ if(mtex) tex= mtex->tex;
+
+ return tex;
+}
/* - */
Modified: trunk/blender/source/blender/src/editipo.c
===
--- trunk/blender/source/blender/src/editipo.c 2008-08-01 02:25:21 UTC (rev
15902)
+++ trunk/blender/source/blender/src/editipo.c 2008-08-01 12:56:29 UTC (rev
15903)
@@ -82,6 +82,7 @@
#include "BKE_group.h"
#include "BKE_ipo.h"
#include "BKE_key.h"
+#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_particle.h"
#include "BKE_texture.h"
@@ -933,6 +934,9 @@
ob->ipowin= ID_TE;
make_texture_editipo(G.sipo);
}
+ else if(G.scene->world && give_current_world_texture()) {
+ make_texture_editipo(G.sipo);
+ }
}
else if(G.sipo->blocktype==ID_CA) {
if (ob) {
@@ -1120,6 +1124,11 @@
*from= (ID *)tex;
if(tex) *ipo= tex->ipo;
}
+ else if(G.scene->world) {
+ Tex *tex= give_current_world_texture();
+ *from= (ID *)tex;
+ if(tex) *ipo= tex->ipo;
+ }
}
else if(blocktype==ID_MA) {
if(ob) {
@@ -6002,4 +6011,4 @@
}
}
BIF_undo_push("Set frame to selected Ipo vertex");
-}
+}
\ No newline at end of file
Modified: trunk/blender/source/blender/src/header_ipo.c
===
--- trunk/blender/source/blender/src/header_ipo.c 2008-08-01 02:25:21 UTC
(rev 15902)
+++ trunk/blender/source/blender/src/header_ipo.c 2008-08-01 12:56:29 UTC
(rev 15903)
@@ -970,7 +970,7 @@
if(ob && ob->type==OB_LAMP)
str += sprintf(str,formatstring, "Lamp",ID_LA, ICON_LAMP);
- if(ob && give_current_texture(ob, ob->actcol))
+ if((ob && give_current_texture(ob,
ob->actcol))||(give_current_world_texture()))
str += sprintf(str,formatstring, "Texture",ID_TE, ICON_TEXTURE);
if(ob){
___
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 [15904] branches/soc-2008-quorn/source/ blender/src/drawtext.c: Mouse cursor positioning and selections now work with word-wrapped text.
Revision: 15904
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15904
Author: quorn
Date: 2008-08-01 15:00:53 +0200 (Fri, 01 Aug 2008)
Log Message:
---
Mouse cursor positioning and selections now work with word-wrapped text. It's
not the best solution but it does the job for now. I wanted to get a working
version committed before I improve/break it.
Modified Paths:
--
branches/soc-2008-quorn/source/blender/src/drawtext.c
Modified: branches/soc-2008-quorn/source/blender/src/drawtext.c
===
--- branches/soc-2008-quorn/source/blender/src/drawtext.c 2008-08-01
12:56:29 UTC (rev 15903)
+++ branches/soc-2008-quorn/source/blender/src/drawtext.c 2008-08-01
13:00:53 UTC (rev 15904)
@@ -139,6 +139,9 @@
static int check_identifier(char ch);
static int check_whitespace(char ch);
+static int get_wrap_width(SpaceText *st);
+static int get_wrap_points(SpaceText *st, char *line);
+
static void get_suggest_prefix(Text *text);
static void confirm_suggestion(Text *text, int skipleft);
@@ -558,14 +561,6 @@
else { linep= &text->curl; charp= &text->curc; }
y= (curarea->winy - y)/st->lheight;
-
- y-= txt_get_span(text->lines.first, *linep) - st->top;
-
- if (y>0) {
- while (y-- != 0) if((*linep)->next) *linep= (*linep)->next;
- } else if (y<0) {
- while (y++ != 0) if((*linep)->prev) *linep= (*linep)->prev;
- }
if(st->showlinenrs)
x-= TXT_OFFSET+TEXTXLOC;
@@ -575,10 +570,103 @@
if (x<0) x= 0;
x = (x/spacetext_get_fontwidth(st)) + st->left;
- w= render_string(st, (*linep)->line);
- if(xlen;
-
+ if (st->wordwrap) {
+ int i, j, endj, curs, max, chop, start, end, chars, loop;
+ char ch;
+
+ /* Point to first visible line */
+ *linep= text->lines.first;
+ for (i=0; itop && (*linep)->next; i++) *linep=
(*linep)->next;
+
+ max= get_wrap_width(st);
+
+ loop= 1;
+ while (loop && *linep) {
+ start= 0;
+ end= max;
+ chop= 1;
+ chars= 0;
+ curs= 0;
+ for (i=0, j=0; loop; j++) {
+
+ /* Mimic replacement of tabs */
+ ch= (*linep)->line[j];
+ if (ch=='\t') {
+ chars= st->tabnumber-i%st->tabnumber;
+ ch= ' ';
+ } else
+ chars= 1;
+
+ while (chars--) {
+ /* Gone too far, go back to last wrap
point */
+ if (y<0) {
+ *charp= endj;
+ loop= 0;
+ break;
+ /* Exactly at the cursor, done */
+ } else if (y==0 && i-start==x) {
+ *charp= curs= j;
+ loop= 0;
+ break;
+ /* Prepare curs for next wrap */
+ } else if (i-end==x) {
+ curs= j;
+ }
+ if (i-start>=max) {
+ if (chop) endj= j;
+ y--;
+ start= end;
+ end += max;
+ chop= 1;
+ if (y==0 && i-start>=x) {
+ *charp= curs;
+ loop= 0;
+ break;
+ }
+ } else if (ch==' ' || ch=='-' ||
ch=='\0') {
+ if (y==0 && i-start>=x) {
+ *charp= curs;
+ loop= 0;
+ break;
+ }
+ end = i+1;
+ endj = j;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15905] branches/sound-branch: not so daily merge with trunk
Revision: 15905 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15905 Author: scourage Date: 2008-08-01 21:46:41 +0200 (Fri, 01 Aug 2008) Log Message: --- not so daily merge with trunk Modified Paths: -- branches/sound-branch/bin/.blender/.Blanguages branches/sound-branch/extern/tinySND/core/SND_DataMultiplexer.cpp branches/sound-branch/extern/tinySND/core/SND_Defines.h branches/sound-branch/extern/tinySND/sdl/sdlDevice.cpp branches/sound-branch/intern/boolop/intern/BOP_Edge.cpp branches/sound-branch/intern/boolop/intern/BOP_Edge.h branches/sound-branch/intern/boolop/intern/BOP_Face.cpp branches/sound-branch/intern/boolop/intern/BOP_Face.h branches/sound-branch/intern/boolop/intern/BOP_Interface.cpp branches/sound-branch/intern/boolop/intern/BOP_Merge.cpp branches/sound-branch/intern/boolop/intern/BOP_Merge.h branches/sound-branch/intern/boolop/intern/BOP_Mesh.cpp branches/sound-branch/intern/boolop/intern/BOP_Mesh.h branches/sound-branch/intern/boolop/intern/BOP_Tag.h branches/sound-branch/intern/boolop/intern/BOP_Vertex.cpp branches/sound-branch/intern/boolop/intern/BOP_Vertex.h branches/sound-branch/projectfiles_vc7/blender/blender.vcproj branches/sound-branch/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/sound-branch/release/scripts/bpymodules/colladaImEx/collada.py branches/sound-branch/release/scripts/bpymodules/colladaImEx/translator.py branches/sound-branch/release/scripts/bpymodules/colladaImEx/xmlUtils.py branches/sound-branch/source/blender/blenkernel/BKE_DerivedMesh.h branches/sound-branch/source/blender/blenkernel/BKE_blender.h branches/sound-branch/source/blender/blenkernel/BKE_texture.h branches/sound-branch/source/blender/blenkernel/intern/DerivedMesh.c branches/sound-branch/source/blender/blenkernel/intern/collision.c branches/sound-branch/source/blender/blenkernel/intern/customdata.c branches/sound-branch/source/blender/blenkernel/intern/texture.c branches/sound-branch/source/blender/blenlib/intern/freetypefont.c branches/sound-branch/source/blender/blenloader/intern/readfile.c branches/sound-branch/source/blender/include/BDR_gpencil.h branches/sound-branch/source/blender/include/BIF_editview.h branches/sound-branch/source/blender/makesdna/DNA_customdata_types.h branches/sound-branch/source/blender/makesdna/DNA_gpencil_types.h branches/sound-branch/source/blender/makesdna/DNA_meshdata_types.h branches/sound-branch/source/blender/src/buttons_editing.c branches/sound-branch/source/blender/src/buttons_logic.c branches/sound-branch/source/blender/src/drawgpencil.c branches/sound-branch/source/blender/src/editipo.c branches/sound-branch/source/blender/src/editobject.c branches/sound-branch/source/blender/src/editview.c branches/sound-branch/source/blender/src/gpencil.c branches/sound-branch/source/blender/src/header_ipo.c branches/sound-branch/source/blender/src/header_view3d.c branches/sound-branch/source/blender/src/meshlaplacian.c branches/sound-branch/source/blender/src/seqaudio2.c branches/sound-branch/source/blender/src/space.c branches/sound-branch/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/sound-branch/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp branches/sound-branch/source/gameengine/Converter/BL_ActionActuator.cpp branches/sound-branch/source/gameengine/Converter/BL_ArmatureObject.cpp branches/sound-branch/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/sound-branch/source/gameengine/Converter/KX_ConvertSensors.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_ActuatorEventManager.h branches/sound-branch/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_AlwaysEventManager.h branches/sound-branch/source/gameengine/GameLogic/SCA_EventManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_EventManager.h branches/sound-branch/source/gameengine/GameLogic/SCA_IObject.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_ISensor.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_ISensor.h branches/sound-branch/source/gameengine/GameLogic/SCA_JoystickManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_JoystickManager.h branches/sound-branch/source/gameengine/GameLogic/SCA_KeyboardManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_KeyboardManager.h branches/sound-branch/source/gameengine/GameLogic/SCA_LogicManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_MouseManager.cpp branches/sound-branch/source/gameengine/GameLogic/SCA_MouseManager.h branches/so
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15906] branches/blender-2.47: branches/ blender-2.47
Revision: 15906 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15906 Author: blendix Date: 2008-08-01 21:49:11 +0200 (Fri, 01 Aug 2008) Log Message: --- branches/blender-2.47 Merge over the game engine changes from trunk into 2.47. The most user visible changes are in logic with new sensors, controllers and actuators, the state system, shape key drivers, dupligroups, and more. There are also new python fynctions and the alpha sorting setting. The rest consists of refactoring, fixes and optimizations. MSVC projectfiles might no be merged over correct, I didn't have a way to check this. Merge from trunk: Revision: 14949 Revision: 14952 Revision: 14960 Revision: 15087 Revision: 15172 Revision: 15182 Revision: 15213 Revision: 15221 Revision: 15227 Revision: 15231 Revision: 15249 Revision: 15260 Revision: 15261 Revision: 15263 Revision: 15264 Revision: 15276 Revision: 15280 Revision: 15291 Revision: 15306 Revision: 15327 Revision: 15333 Revision: 15335 Revision: 15336 Revision: 15345 Revision: 15346 Revision: 15347 Revision: 15348 Revision: 15352 Revision: 15354 Revision: 15359 Revision: 15367 Revision: 15376 Revision: 15377 Revision: 15382 Revision: 15387 Revision: 15388 Revision: 15388 Revision: 15394 Revision: 15395 Revision: 15397 Revision: 15413 Revision: 15420 Revision: 15421 Revision: 15425 Revision: 15431 Revision: 15451 Revision: 15477 Revision: 15486 Revision: 15498 Revision: 15504 Revision: 15517 Revision: 15519 Revision: 15546 Revision: 15547 Revision: 15592 Revision: 15607 Revision: 15611 Revision: 15628 Revision: 15638 Revision: 15639 Revision: 15642 Revision: 15656 Revision: 15660 Revision: 15662 Revision: 15663 Revision: 15668 Revision: 15693 Revision: 15695 Revision: 15702 Revision: 15714 Revision: 15723 Revision: 15760 Revision: 15778 Revision: 15843 Revision: 15855 Revision: 15867 Revision: 15872 Revision: 15873 Revision: 15874 Revision: 15875 Revision: 15882 Revision: 15883 Revision: 15884 Revision: 15886 Modified Paths: -- branches/blender-2.47/blenderplayer/CMakeLists.txt branches/blender-2.47/extern/CMakeLists.txt branches/blender-2.47/extern/Makefile branches/blender-2.47/extern/SConscript branches/blender-2.47/extern/make/msvc_7_0/extern.sln branches/blender-2.47/intern/moto/include/GEN_Map.h branches/blender-2.47/projectfiles_vc7/blender/blender.vcproj branches/blender-2.47/projectfiles_vc7/blender/src/BL_src.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/converter/KX_converter.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj branches/blender-2.47/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/blender-2.47/source/Makefile branches/blender-2.47/source/blender/blenkernel/BKE_DerivedMesh.h branches/blender-2.47/source/blender/blenkernel/BKE_action.h branches/blender-2.47/source/blender/blenkernel/BKE_blender.h branches/blender-2.47/source/blender/blenkernel/BKE_ipo.h branches/blender-2.47/source/blender/blenkernel/BKE_key.h branches/blender-2.47/source/blender/blenkernel/BKE_scene.h branches/blender-2.47/source/blender/blenkernel/intern/DerivedMesh.c branches/blender-2.47/source/blender/blenkernel/intern/action.c branches/blender-2.47/source/blender/blenkernel/intern/customdata.c branches/blender-2.47/source/blender/blenkernel/intern/key.c branches/blender-2.47/source/blender/blenkernel/intern/sca.c branches/blender-2.47/source/blender/blenloader/intern/readfile.c branches/blender-2.47/source/blender/blenloader/intern/writefile.c branches/blender-2.47/source/blender/include/BIF_butspace.h branches/blender-2.47/source/blender/include/BIF_interface.h branches/blender-2.47/source/blender/include/butspace.h branches/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15907] branches/harmonic-skeleton/source/ blender/src/reeb.c: Draw embeding points in blue, easy to visualize long stretches without embedings.
Revision: 15907
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15907
Author: theeth
Date: 2008-08-01 22:01:01 +0200 (Fri, 01 Aug 2008)
Log Message:
---
Draw embeding points in blue, easy to visualize long stretches without
embedings.
Modified Paths:
--
branches/harmonic-skeleton/source/blender/src/reeb.c
Modified: branches/harmonic-skeleton/source/blender/src/reeb.c
===
--- branches/harmonic-skeleton/source/blender/src/reeb.c2008-08-01
19:49:11 UTC (rev 15906)
+++ branches/harmonic-skeleton/source/blender/src/reeb.c2008-08-01
20:01:01 UTC (rev 15907)
@@ -3432,8 +3432,6 @@
char text[128];
char *s = text;
- initArcIterator(&iter, arc, arc->head);
-
if (arc->symmetry_level == 1)
{
glColor3f(1, 0, 0);
@@ -3455,6 +3453,7 @@
if (arc->bcount)
{
+ initArcIterator(&iter, arc, arc->head);
for (bucket = nextBucket(&iter); bucket; bucket
= nextBucket(&iter))
{
glVertex3fv(bucket->p);
@@ -3469,6 +3468,16 @@
glBegin(GL_POINTS);
glVertex3fv(arc->head->p);
glVertex3fv(arc->tail->p);
+
+ glColor3f(0.5f, 0.5f, 1);
+ if (arc->bcount)
+ {
+ initArcIterator(&iter, arc, arc->head);
+ for (bucket = nextBucket(&iter); bucket; bucket
= nextBucket(&iter))
+ {
+ glVertex3fv(bucket->p);
+ }
+ }
glEnd();
VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);
___
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 [15908] branches/harmonic-skeleton/source/ blender/src/reeb.c: Fix problem with long stretches without embedding between head/ tail nodes and the actu
Revision: 15908
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15908
Author: theeth
Date: 2008-08-01 22:29:42 +0200 (Fri, 01 Aug 2008)
Log Message:
---
Fix problem with long stretches without embedding between head/tail nodes and
the actual start and end of embedding bucket.
Instead of having to muck around in the generating and retargetting code to
deal with those cases, just fill dummy buckets with interpolations.
Modified Paths:
--
branches/harmonic-skeleton/source/blender/src/reeb.c
Modified: branches/harmonic-skeleton/source/blender/src/reeb.c
===
--- branches/harmonic-skeleton/source/blender/src/reeb.c2008-08-01
20:01:01 UTC (rev 15907)
+++ branches/harmonic-skeleton/source/blender/src/reeb.c2008-08-01
20:29:42 UTC (rev 15908)
@@ -737,6 +737,71 @@
}
}
+static void ExtendArcBuckets(ReebArc *arc)
+{
+ ReebArcIterator iter;
+ EmbedBucket *previous, *bucket, *last_bucket, *first_bucket;
+ float average_length = 0, length;
+ int padding_head = 0, padding_tail = 0;
+
+ initArcIterator(&iter, arc, arc->head);
+
+ for ( previous = nextBucket(&iter), bucket = nextBucket(&iter);
+ bucket;
+ previous = bucket, bucket = nextBucket(&iter)
+ )
+ {
+ average_length += VecLenf(previous->p, bucket->p);
+ }
+ average_length /= (arc->bcount - 1);
+
+ first_bucket = arc->buckets;
+ last_bucket = arc->buckets + (arc->bcount - 1);
+
+ length = VecLenf(first_bucket->p, arc->head->p);
+ if (length > 2 * average_length)
+ {
+ padding_head = (int)floor(length / average_length);
+ }
+
+ length = VecLenf(last_bucket->p, arc->tail->p);
+ if (length > 2 * average_length)
+ {
+ padding_tail = (int)floor(length / average_length);
+ }
+
+ if (padding_head + padding_tail > 0)
+ {
+ EmbedBucket *old_buckets = arc->buckets;
+
+ arc->buckets = MEM_callocN(sizeof(EmbedBucket) * (padding_head
+ arc->bcount + padding_tail), "embed bucket");
+ memcpy(arc->buckets + padding_head, old_buckets, arc->bcount *
sizeof(EmbedBucket));
+
+ arc->bcount = padding_head + arc->bcount + padding_tail;
+ }
+
+ if (padding_head > 0)
+ {
+ interpolateBuckets(arc, arc->head->p, first_bucket->p, 0,
padding_head);
+ }
+
+ if (padding_tail > 0)
+ {
+ interpolateBuckets(arc, last_bucket->p, arc->tail->p,
arc->bcount - padding_tail, arc->bcount - 1);
+ }
+}
+
+/* CALL THIS ONLY AFTER FILTERING, SINCE IT MESSES UP WEIGHT DISTRIBUTION */
+void extendGraphBuckets(ReebGraph *rg)
+{
+ ReebArc *arc;
+
+ for (arc = rg->arcs.first; arc; arc = arc->next)
+ {
+ ExtendArcBuckets(arc);
+ }
+}
+
/ LENGTH CALCULATIONS
/
void calculateArcLength(ReebArc *arc)
@@ -1749,6 +1814,8 @@
{
postprocessGraph(rg, method);
}
+
+ extendGraphBuckets(rg);
}
/** WEIGHT SPREADING
***/
___
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 [15909] trunk/blender/source/blender:
Revision: 15909
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15909
Author: mal_cando
Date: 2008-08-01 23:12:47 +0200 (Fri, 01 Aug 2008)
Log Message:
---
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/src/header_info.c
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2008-08-01
20:29:42 UTC (rev 15908)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2008-08-01
21:12:47 UTC (rev 15909)
@@ -2275,7 +2275,7 @@
unsigned char buf[1024];
int count, progfd= -1;
- if (!runtime) {
+ if (!BLI_exists(runtime)) {
cause= "Unable to find runtime";
goto cleanup;
}
Modified: trunk/blender/source/blender/src/header_info.c
===
--- trunk/blender/source/blender/src/header_info.c 2008-08-01 20:29:42 UTC
(rev 15908)
+++ trunk/blender/source/blender/src/header_info.c 2008-08-01 21:12:47 UTC
(rev 15909)
@@ -1078,9 +1078,9 @@
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Screenshot
Subwindow|Ctrl F3", 0, yco-=20, menuwidth, 19, NULL, 0.0,
0.0, 1, 24, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Screenshot All|Ctrl
Shift F3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 25,
"");
#if GAMEBLENDER == 1
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Runtime...",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 22, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Game As
Runtime...",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0,
1, 22, "");
#ifdef _WIN32
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Dynamic
Runtime...",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23,
"");
+// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Dynamic
Runtime...",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23,
"");
#endif
#endif
uiDefBut(block, SEPR, 0, "",0,
yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15910] trunk/blender/source/blender/src/ header_info.c: Fix for GE Make Runtime menu option
Revision: 15910 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15910 Author: mal_cando Date: 2008-08-01 23:17:54 +0200 (Fri, 01 Aug 2008) Log Message: --- Fix for GE Make Runtime menu option Doh - I forgot to add a comment to the previous commit. This adds a file exists check for Make Dynamic Runtime for the GE. It also removes this menu option for now, as the required file ( blenderdynplayer.exe ) hasn't been included with the Blender app for quite a few releases ( therefore the feature has been broken ). I also renamed the option, to make it a bit more understandable. This might even be better moved to the Game menu, but I didn't want to do that ( yet :) ) Modified Paths: -- trunk/blender/source/blender/src/header_info.c Modified: trunk/blender/source/blender/src/header_info.c === --- trunk/blender/source/blender/src/header_info.c 2008-08-01 21:12:47 UTC (rev 15909) +++ trunk/blender/source/blender/src/header_info.c 2008-08-01 21:17:54 UTC (rev 15910) @@ -1080,7 +1080,7 @@ #if GAMEBLENDER == 1 uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Game As Runtime...",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 22, ""); #ifdef _WIN32 -// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Dynamic Runtime...",0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23, ""); +// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Dynamic Runtime...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23, ""); #endif #endif uiDefBut(block, SEPR, 0, "",0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15911] branches/soc-2008-jaguarandi: svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 15911 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15911 Author: jaguarandi Date: 2008-08-01 23:37:36 +0200 (Fri, 01 Aug 2008) Log Message: --- svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -- branches/soc-2008-jaguarandi/bin/.blender/.Blanguages branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Edge.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Edge.h branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Face.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Face.h branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Interface.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Merge.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Merge.h branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Mesh.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Mesh.h branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Tag.h branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Vertex.cpp branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Vertex.h branches/soc-2008-jaguarandi/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj branches/soc-2008-jaguarandi/projectfiles_vc7/blender/src/BL_src.vcproj branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/collada.py branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/translator.py branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/xmlUtils.py branches/soc-2008-jaguarandi/release/scripts/rvk1_torvk2.py branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_DerivedMesh.h branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_blender.h branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_idprop.h branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_texture.h branches/soc-2008-jaguarandi/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/collision.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/constraint.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/customdata.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/idprop.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/scene.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/softbody.c branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/texture.c branches/soc-2008-jaguarandi/source/blender/blenlib/intern/arithb.c branches/soc-2008-jaguarandi/source/blender/blenlib/intern/freetypefont.c branches/soc-2008-jaguarandi/source/blender/blenloader/intern/readfile.c branches/soc-2008-jaguarandi/source/blender/blenloader/intern/writefile.c branches/soc-2008-jaguarandi/source/blender/include/BDR_gpencil.h branches/soc-2008-jaguarandi/source/blender/include/BIF_editaction.h branches/soc-2008-jaguarandi/source/blender/include/BIF_editarmature.h branches/soc-2008-jaguarandi/source/blender/include/BIF_editview.h branches/soc-2008-jaguarandi/source/blender/include/BSE_drawview.h branches/soc-2008-jaguarandi/source/blender/include/butspace.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_ID.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_action_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_actuator_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_armature_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_constraint_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_customdata_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_gpencil_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_meshdata_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_object_types.h branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_sequence_types.h branches/soc-2008-jaguarandi/source/blender/nodes/intern/SHD_nodes/SHD_material.c branches/soc-2008-jaguarandi/source/blender/nodes/intern/SHD_util.c branches/soc-2008-jaguarandi/source/blender/nodes/intern/SHD_util.h branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Armature.c branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Bone.c branches/soc-2008-jaguarandi/source/blender/python/api2_2x/IDProp.c branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Armature.py branches/soc-2008-jaguarandi/source/blende
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15912] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: soc-2008-mxcurioni: made considerable changes to support cross-language polymorp
Revision: 15912
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15912
Author: mxcurioni
Date: 2008-08-01 23:55:58 +0200 (Fri, 01 Aug 2008)
Log Message:
---
soc-2008-mxcurioni: made considerable changes to support cross-language
polymorphism for UnaryFunction0D, Interface0D, Interface1D. Add to change
UnaryFunction1D to static UnaryFunction1D_void. Resolved namespace
collision on the Image class (changed to FrsImage). There is greater support
for style modules but somehow, some do not show anything yet (japanese_bigbrush
being an example).
Modified Paths:
--
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Director.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Director.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Predicates1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Stroke.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Interface1D.h
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
===
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
2008-08-01 21:37:36 UTC (rev 15911)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/Image.h
2008-08-01 21:55:58 UTC (rev 15912)
@@ -44,12 +44,12 @@
* size w*h, and access these pixels using x,y coordinates
* specified in the whole image coordinate system.
*/
-class Image
+class FrsImage
{
public:
/*! Default constructor */
- Image() {
+ FrsImage() {
_storedWidth = 0;
_storedHeight = 0;
_width = 0;
@@ -59,7 +59,7 @@
}
/*! Copy constructor */
- Image(const Image& brother) {
+ FrsImage(const FrsImage& brother) {
_storedWidth = brother._storedWidth;
_storedHeight = brother._storedHeight;
_width = brother._width;
@@ -68,10 +68,10 @@
_Oy = brothe
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15913] branches/soc-2008-quorn: Merged 15771:15912 from trunk
Revision: 15913 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15913 Author: quorn Date: 2008-08-02 01:39:52 +0200 (Sat, 02 Aug 2008) Log Message: --- Merged 15771:15912 from trunk Modified Paths: -- branches/soc-2008-quorn/bin/.blender/.Blanguages branches/soc-2008-quorn/intern/boolop/intern/BOP_Edge.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Edge.h branches/soc-2008-quorn/intern/boolop/intern/BOP_Face.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Face.h branches/soc-2008-quorn/intern/boolop/intern/BOP_Interface.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Merge.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Merge.h branches/soc-2008-quorn/intern/boolop/intern/BOP_Mesh.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Mesh.h branches/soc-2008-quorn/intern/boolop/intern/BOP_Tag.h branches/soc-2008-quorn/intern/boolop/intern/BOP_Vertex.cpp branches/soc-2008-quorn/intern/boolop/intern/BOP_Vertex.h branches/soc-2008-quorn/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/collada.py branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/translator.py branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/xmlUtils.py branches/soc-2008-quorn/release/scripts/rvk1_torvk2.py branches/soc-2008-quorn/source/blender/blenkernel/BKE_DerivedMesh.h branches/soc-2008-quorn/source/blender/blenkernel/BKE_blender.h branches/soc-2008-quorn/source/blender/blenkernel/BKE_texture.h branches/soc-2008-quorn/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/soc-2008-quorn/source/blender/blenkernel/intern/DerivedMesh.c branches/soc-2008-quorn/source/blender/blenkernel/intern/collision.c branches/soc-2008-quorn/source/blender/blenkernel/intern/constraint.c branches/soc-2008-quorn/source/blender/blenkernel/intern/customdata.c branches/soc-2008-quorn/source/blender/blenkernel/intern/texture.c branches/soc-2008-quorn/source/blender/blenlib/intern/freetypefont.c branches/soc-2008-quorn/source/blender/blenloader/intern/readfile.c branches/soc-2008-quorn/source/blender/blenloader/intern/writefile.c branches/soc-2008-quorn/source/blender/include/BDR_gpencil.h branches/soc-2008-quorn/source/blender/include/BIF_editarmature.h branches/soc-2008-quorn/source/blender/include/BIF_editview.h branches/soc-2008-quorn/source/blender/makesdna/DNA_armature_types.h branches/soc-2008-quorn/source/blender/makesdna/DNA_constraint_types.h branches/soc-2008-quorn/source/blender/makesdna/DNA_customdata_types.h branches/soc-2008-quorn/source/blender/makesdna/DNA_gpencil_types.h branches/soc-2008-quorn/source/blender/makesdna/DNA_meshdata_types.h branches/soc-2008-quorn/source/blender/makesdna/DNA_object_types.h branches/soc-2008-quorn/source/blender/python/api2_2x/Armature.c branches/soc-2008-quorn/source/blender/python/api2_2x/Bone.c branches/soc-2008-quorn/source/blender/python/api2_2x/doc/Armature.py branches/soc-2008-quorn/source/blender/python/api2_2x/sceneRender.c branches/soc-2008-quorn/source/blender/src/buttons_editing.c branches/soc-2008-quorn/source/blender/src/buttons_logic.c branches/soc-2008-quorn/source/blender/src/buttons_object.c branches/soc-2008-quorn/source/blender/src/drawgpencil.c branches/soc-2008-quorn/source/blender/src/drawview.c branches/soc-2008-quorn/source/blender/src/editarmature.c branches/soc-2008-quorn/source/blender/src/editipo.c branches/soc-2008-quorn/source/blender/src/editobject.c branches/soc-2008-quorn/source/blender/src/editview.c branches/soc-2008-quorn/source/blender/src/gpencil.c branches/soc-2008-quorn/source/blender/src/header_info.c branches/soc-2008-quorn/source/blender/src/header_ipo.c branches/soc-2008-quorn/source/blender/src/header_view3d.c branches/soc-2008-quorn/source/blender/src/interface.c branches/soc-2008-quorn/source/blender/src/meshlaplacian.c branches/soc-2008-quorn/source/blender/src/outliner.c branches/soc-2008-quorn/source/blender/src/poseobject.c branches/soc-2008-quorn/source/blender/src/sequence.c branches/soc-2008-quorn/source/blender/src/space.c branches/soc-2008-quorn/source/blender/src/transform_conversions.c branches/soc-2008-quorn/source/blender/src/transform_manipulator.c branches/soc-2008-quorn/source/creator/creator.c branches/soc-2008-quorn/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/soc-2008-quorn/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp branches/soc-2008-quorn/source/gameengine/Converter/BL_ActionActuator.cpp branches/soc-2008-quorn/source/gameengine/Converter/BL_ArmatureObject.cpp branches/soc-2008-quorn/source/gameengine/Converter/BL_BlenderDataConver
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15914] trunk/blender/intern: Scons - Mingw Compiling Fix:
Revision: 15914
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15914
Author: aligorith
Date: 2008-08-02 02:25:50 +0200 (Sat, 02 Aug 2008)
Log Message:
---
Scons - Mingw Compiling Fix:
When using BF_SPLIT_SRCS as a hack to get some of the larger libs compiled,
there were some problems linking Blender related to some boolean calls. This
commit tweaks the priorities for the boolean libs for the 'intern' group so
that they get linked before the src libs are.
Modified Paths:
--
trunk/blender/intern/boolop/SConscript
trunk/blender/intern/bsp/SConscript
Modified: trunk/blender/intern/boolop/SConscript
===
--- trunk/blender/intern/boolop/SConscript 2008-08-01 23:39:52 UTC (rev
15913)
+++ trunk/blender/intern/boolop/SConscript 2008-08-02 00:25:50 UTC (rev
15914)
@@ -8,7 +8,7 @@
incs += ' ../../source/blender/blenlib'
if (env['OURPLATFORM'] == 'win32-mingw'):
-env.BlenderLib ('blender_bop', sources, Split(incs) , [],
libtype=['common','intern'], priority = [5,50] )
+env.BlenderLib ('blender_bop', sources, Split(incs) , [],
libtype=['common','intern'], priority = [30,85] )
else:
env.BlenderLib ('blender_bop', sources, Split(incs) , [],
libtype='common', priority = 5 )
Modified: trunk/blender/intern/bsp/SConscript
===
--- trunk/blender/intern/bsp/SConscript 2008-08-01 23:39:52 UTC (rev 15913)
+++ trunk/blender/intern/bsp/SConscript 2008-08-02 00:25:50 UTC (rev 15914)
@@ -6,7 +6,7 @@
incs = 'intern ../container ../moto/include ../memutil'
if (env['OURPLATFORM'] == 'win32-mingw'):
-env.BlenderLib ('blender_BSP', sources, Split(incs), [],
libtype=['common','intern'], priority=[26,26] )
+env.BlenderLib ('blender_BSP', sources, Split(incs), [],
libtype=['common','intern'], priority=[26,69] )
else:
env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core',
priority=26 )
___
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 [15915] branches/blender-2.47: branches/ blender-2.47
Revision: 15915
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15915
Author: bdiego
Date: 2008-08-02 06:41:04 +0200 (Sat, 02 Aug 2008)
Log Message:
---
branches/blender-2.47
Merge from trunk:
Revision: 15880
Revision: 15893
Revision: 15895
Revision: 15903
Revision: 15909
Revision: 15910
Modified Paths:
--
branches/blender-2.47/bin/.blender/.Blanguages
branches/blender-2.47/source/blender/blenkernel/BKE_texture.h
branches/blender-2.47/source/blender/blenkernel/intern/texture.c
branches/blender-2.47/source/blender/blenloader/intern/writefile.c
branches/blender-2.47/source/blender/src/editipo.c
branches/blender-2.47/source/blender/src/header_info.c
branches/blender-2.47/source/blender/src/header_ipo.c
branches/blender-2.47/source/blender/src/meshlaplacian.c
Added Paths:
---
branches/blender-2.47/bin/.blender/locale/kr/
branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/
branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/blender-2.47/po/kr.po
Removed Paths:
-
branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/
branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
Modified: branches/blender-2.47/bin/.blender/.Blanguages
===
--- branches/blender-2.47/bin/.blender/.Blanguages 2008-08-02 00:25:50 UTC
(rev 15914)
+++ branches/blender-2.47/bin/.blender/.Blanguages 2008-08-02 04:41:04 UTC
(rev 15915)
@@ -20,3 +20,4 @@
Arabic:ar
Bulgarian:bg
Greek:el
+Korean:kr
Copied: branches/blender-2.47/bin/.blender/locale/kr (from rev 15893,
trunk/blender/bin/.blender/locale/kr)
Copied: branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES (from rev
15893, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES)
Deleted: branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===
(Binary files differ)
Copied: branches/blender-2.47/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
(from rev 15893, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo)
===
(Binary files differ)
Copied: branches/blender-2.47/po/kr.po (from rev 15895, trunk/blender/po/kr.po)
===
--- branches/blender-2.47/po/kr.po (rev 0)
+++ branches/blender-2.47/po/kr.po 2008-08-02 04:41:04 UTC (rev 15915)
@@ -0,0 +1,19426 @@
+# J.H. Jeong <[EMAIL PROTECTED]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: blender ver 2.4.6\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2008-07-31 14:47+0900\n"
+"Last-Translator: J.H. Jeong <[EMAIL PROTECTED]>\n"
+"Language-Team: J.H. Jeong <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.0.2\n"
+"X-Poedit-Language: korean\n"
+"X-Poedit-Country: KOREA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Rosetta-Export-Date: 2008-06-05\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Bookmarks: 2286,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
+
+msgid "Global Undo History "
+msgstr "전역 실행 취소 내역"
+
+msgid "DataBrowse "
+msgstr "자료찾기 "
+
+msgid "blendfile"
+msgstr "Blend파일"
+
+msgid "[Bone Dict: {"
+msgstr "[골격 용어: {"
+
+msgid "Grid"
+msgstr "격자"
+
+msgid "Outside"
+msgstr "바깥"
+
+msgid "[Pose Bone Dict: {"
+msgstr "[자세 골격 사전: {"
+
+msgid "warning: cannot assign more than 16 materials to 1 mesh"
+msgstr "경고: 한 개 망사에 16개 이상 재질 할당할 수 없음"
+
+msgid "Can't edit library data"
+msgstr "라이브러리 자료 편집 불가"
+
+msgid "New material"
+msgstr "새 재질"
+
+msgid "Delete material index"
+msgstr "재질 목록 삭제"
+
+msgid "Assign material index"
+msgstr "재질 목록 할당"
+
+msgid "Select material index"
+msgstr "재질 목록 선택"
+
+msgid "Set Smooth"
+msgstr "부드러움 설정"
+
+msgid "Set Solid"
+msgstr "입체 설정"
+
+msgid "Mesh"
+msgstr "망사"
+
+msgid "Editing"
+msgstr "편집"
+
+msgid "Auto Smooth"
+msgstr "자동 부드러움"
+
+msgid "Treats all set-smoothed faces with angles less than Degr: as 'smooth'
during render"
+msgstr "각도이하의 각을 가진 전체 부드러움으로 설정된 면을 다룸: 렌더동안 '부드러움'처럼 "
+
+msgid "Degr:"
+msgstr "각도:"
+
+msgid "Defines maximum angle between face normals that 'Auto Smooth' will
operate on"
+msgstr "자동 부드러움을 실행하는 면들 사이에서 최대 각을 정의"
+
+msgid "VertCol"
+msgstr "꼭지점 색상"
+
+msgid "Make"
+msgstr "생성"
+
+msgid "Enables vertex color painting on active Mesh"
+msgstr "활성 망사에서 꼭지점 색상 칠하기 가능"
+
+msgid "Delete"
+msgstr "삭제"
+
+msgid "Deletes vertex colors on active Mesh"
+msgstr "활성 망사에서 꼭지점 색상을 삭제"
+
+msgid "TexFace"
+msgstr "바탕결면"
+
+msgid "Enables the active Mesh's faces for UV coordinate mapping"
+msgstr "UV 좌표맵을 위한 활성 망사면 가능"
+
+msgid "Deletes UV coordinates for ac
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15916] trunk/blender/source/blender/src/ header_info.c: * Minor tweaks to file menu item naming
Revision: 15916 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15916 Author: broken Date: 2008-08-02 08:11:35 +0200 (Sat, 02 Aug 2008) Log Message: --- * Minor tweaks to file menu item naming Modified Paths: -- trunk/blender/source/blender/src/header_info.c Modified: trunk/blender/source/blender/src/header_info.c === --- trunk/blender/source/blender/src/header_info.c 2008-08-02 04:41:04 UTC (rev 15915) +++ trunk/blender/source/blender/src/header_info.c 2008-08-02 06:11:35 UTC (rev 15916) @@ -1026,7 +1026,7 @@ block= uiNewBlock(&curarea->uiblocks, "info_externalfiles", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_info_externalfiles, NULL); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pack into Blend", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pack into .blend file", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, ""); #if 0 uiDefBut(block, BUTM, 1, "Unpack Data to current dir", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 2, "Removes all packed files from the project and saves them to the current directory"); #endif @@ -1036,8 +1036,8 @@ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make all Paths Relative",0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 10, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make all Paths Absolute",0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 11, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Report Missing Files", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 12, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Missing Files", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 13, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Report Missing Files...",0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 12, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Missing Files...", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 13, ""); uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 60); ___ 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 [15917] trunk/blender/source/blender/src: * (slightly modified) old patch #7471 from Davide Vercelli - menu items for Show All Layers/ Show Previous l
Revision: 15917
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15917
Author: broken
Date: 2008-08-02 08:29:15 +0200 (Sat, 02 Aug 2008)
Log Message:
---
* (slightly modified) old patch #7471 from Davide Vercelli - menu items for
Show All Layers/Show Previous layers in the 3D View. Sorry this took so long!
Modified Paths:
--
trunk/blender/source/blender/src/header_view3d.c
trunk/blender/source/blender/src/toolbox.c
Modified: trunk/blender/source/blender/src/header_view3d.c
===
--- trunk/blender/source/blender/src/header_view3d.c2008-08-02 06:11:35 UTC
(rev 15916)
+++ trunk/blender/source/blender/src/header_view3d.c2008-08-02 06:29:15 UTC
(rev 15917)
@@ -166,9 +166,9 @@
if(event==-1 && (G.qual & LR_CTRLKEY)) {
G.vd->scenelock= !G.vd->scenelock;
do_view3d_buttons(B_SCENELOCK);
- } else if (event==-1) {
+ } else if (event<0) {
if(G.vd->lay== (1<<20)-1) {
- if(G.qual & LR_SHIFTKEY) G.vd->lay= oldlay;
+ if(event==-2 || G.qual & LR_SHIFTKEY) G.vd->lay= oldlay;
}
else {
oldlay= G.vd->lay;
@@ -605,6 +605,9 @@
case 21: /* Grease Pencil */
add_blockhandler(curarea, VIEW3D_HANDLER_GREASEPENCIL,
UI_PNL_UNSTOW);
break;
+ case 22: /* View all layers */
+ do_layer_buttons(-2);
+ break;
}
allqueue(REDRAWVIEW3D, 1);
}
@@ -648,6 +651,11 @@
uiDefBut(block, SEPR, 0, "",0,
yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+ if(G.vd->lay== (1<<20)-1) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
"View Previous Layers|Shift ~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,
22, "");
+ else uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show All Layers|
~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 22, "");
+
+ uiDefBut(block, SEPR, 0, "",0,
yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+
if(G.vd->localview) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT,
"Local View|NumPad /", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Local
View|NumPad /", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
if(!G.vd->localview) uiDefIconTextBut(block, BUTM, 1,
ICON_CHECKBOX_HLT, "Global View|NumPad /",0, yco-=20, menuwidth, 19,
NULL, 0.0, 0.0, 0, 8, "");
@@ -726,6 +734,9 @@
case 10: /* Lamp */
selectall_type(OB_LAMP);
break;
+ case 20:
+ do_layer_buttons(-2);
+ break;
}
allqueue(REDRAWVIEW3D, 0);
}
Modified: trunk/blender/source/blender/src/toolbox.c
===
--- trunk/blender/source/blender/src/toolbox.c 2008-08-02 06:11:35 UTC (rev
15916)
+++ trunk/blender/source/blender/src/toolbox.c 2008-08-02 06:29:15 UTC (rev
15917)
@@ -125,8 +125,6 @@
void asciitoraw(int ch, unsigned short *event, unsigned short *qual)
{
- if( isalpha(ch)==0 ) return;
-
if( isupper(ch) ) {
*qual= LEFTSHIFTKEY;
ch= tolower(ch);
@@ -804,7 +802,10 @@
case 'd': key= PAGEDOWNKEY; break;
}
}
- else asciitoraw(event, &key, &qual[3]);
+ else if (isalpha(event))
+ asciitoraw(event, &key, &qual[3]);
+ else if (event == '~')
+ key = ACCENTGRAVEKEY;
for (i=0;i<4;i++)
{
@@ -1213,6 +1214,8 @@
{ 0, "Ortho/Perspective|NumPad 5",TB_PAD|'5', NULL},
{ 0, "Local/Global View|NumPad /",TB_PAD|'/', NULL},
{ 0, "SEPR", 0, NULL},
+{ 0, "Show All Layers|Shift ~", TB_SHIFT|'~', NULL},
+{ 0, "SEPR", 0, NULL},
{ 0, "Align View",0, tb_view_alignview},
{ 0, "SEPR", 0, NULL},
{ 0, "View Selected|NumPad .",TB_PAD|'.', NULL},
___
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 [15918] trunk/blender/source/blender/src/ header_view3d.c: * patch #17394 by Vilem Novak - add menu item for ' Make Proxy Object'.
Revision: 15918
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15918
Author: broken
Date: 2008-08-02 08:31:56 +0200 (Sat, 02 Aug 2008)
Log Message:
---
* patch #17394 by Vilem Novak - add menu item for 'Make Proxy Object'. Thanks!
Modified Paths:
--
trunk/blender/source/blender/src/header_view3d.c
Modified: trunk/blender/source/blender/src/header_view3d.c
===
--- trunk/blender/source/blender/src/header_view3d.c2008-08-02 06:29:15 UTC
(rev 15917)
+++ trunk/blender/source/blender/src/header_view3d.c2008-08-02 06:31:56 UTC
(rev 15918)
@@ -651,7 +651,7 @@
uiDefBut(block, SEPR, 0, "",0,
yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
- if(G.vd->lay== (1<<20)-1) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
"View Previous Layers|Shift ~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,
22, "");
+ if(G.vd->lay== (1<<20)-1) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
"Show Previous Layers|Shift ~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,
22, "");
else uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show All Layers|
~", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 22, "");
uiDefBut(block, SEPR, 0, "",0,
yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -2478,8 +2478,11 @@
case 15: /* Object Panel */
add_blockhandler(curarea, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW);
break;
+ case 16: /* make proxy object*/
+ make_proxy();
+ break;
#ifdef WITH_VERSE
- case 16: /* Share Object at Verse server */
+ case 17: /* Share Object at Verse server */
if(session_list.first != session_list.last) session =
session_menu();
else session = session_list.first;
if(session) b_verse_push_object(session, ob);
@@ -2504,7 +2507,7 @@
if (base) ob= base->object;
if(ob && (ob->type == OB_MESH) && (!ob->vnode)) {
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at
Verse Server", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at
Verse Server", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 17, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6,
NULL, 0.0, 0.0, 0, 0, "");
}
}
@@ -2530,6 +2533,7 @@
uiDefBut(block, SEPR, 0, "",0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Proxy|Ctrl Alt P",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
uiDefIconTextBlockBut(block, view3d_edit_object_makelinksmenu, NULL,
ICON_RIGHTARROW_THIN, "Make Links", 0, yco-=20, 120, 19, "");
uiDefIconTextBlockBut(block, view3d_edit_object_singleusermenu, NULL,
ICON_RIGHTARROW_THIN, "Make Single User", 0, yco-=20, 120, 19, "");
uiDefIconTextBlockBut(block, view3d_edit_object_makelocalmenu, NULL,
ICON_RIGHTARROW_THIN, "Make Local", 0, yco-=20, 120, 19, "");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
