Revision: 14725
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14725
Author: genscher
Date: 2008-05-07 19:51:33 +0200 (Wed, 07 May 2008)
Log Message:
-----------
Missed some files during merge i think
Modified Paths:
--------------
branches/cloth/blender/source/blender/blenkernel/intern/blender.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/filesel.c
branches/cloth/blender/source/blender/src/headerbuttons.c
branches/cloth/blender/source/blender/src/imasel.c
branches/cloth/blender/source/blender/src/interface.c
branches/cloth/blender/source/blender/src/space.c
Modified: branches/cloth/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/blender.c
2008-05-07 17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/blenkernel/intern/blender.c
2008-05-07 17:51:33 UTC (rev 14725)
@@ -383,8 +383,9 @@
/* special cases, override loaded flags: */
if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG;
else bfd->globalf &= ~G_DEBUG;
- if (!(G.f & G_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS;
+ if ((U.flag & USER_DONT_DOSCRIPTLINKS)) bfd->globalf &=
~G_DOSCRIPTLINKS;
+
G.f= bfd->globalf;
if (!G.background) {
Modified: branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
2008-05-07 17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
2008-05-07 17:51:33 UTC (rev 14725)
@@ -5515,6 +5515,7 @@
DerivedMesh *dm = derivedData;
ParticleSystemModifierData *psmd= (ParticleSystemModifierData*) md;
ParticleSystem * psys=0;
+ Mesh *me;
int needsFree=0;
if(ob->particlesystem.first)
@@ -5522,6 +5523,14 @@
else
return;
+ /* multires check */
+ if(ob->type == OB_MESH) {
+ me= (Mesh*)ob->data;
+ if(me->mr && me->mr->current != 1)
+ modifier_setError(md,
+ "Particles only supported on first multires
level.");
+ }
+
if(!psys_check_enabled(ob, psys))
return;
Modified: branches/cloth/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/particle.c
2008-05-07 17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/blenkernel/intern/particle.c
2008-05-07 17:51:33 UTC (rev 14725)
@@ -250,10 +250,17 @@
int psys_check_enabled(Object *ob, ParticleSystem *psys)
{
ParticleSystemModifierData *psmd;
+ Mesh *me;
if(psys->flag & PSYS_DISABLED)
return 0;
+ if(ob->type == OB_MESH) {
+ me= (Mesh*)ob->data;
+ if(me->mr && me->mr->current != 1)
+ return 0;
+ }
+
psmd= psys_get_modifier(ob, psys);
if(psys->renderdata) {
if(!(psmd->modifier.mode & eModifierMode_Render))
Modified: branches/cloth/blender/source/blender/src/buttons_object.c
===================================================================
--- branches/cloth/blender/source/blender/src/buttons_object.c 2008-05-07
17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/src/buttons_object.c 2008-05-07
17:51:33 UTC (rev 14725)
@@ -4415,8 +4415,8 @@
uiDefButS(block, NUM, B_PART_RECALC, "Steps:",
butx,(buty+=buth),butw,buth, &part->draw_step, 0.0, 7.0, 0, 0, "How many steps
paths are drawn with (power of 2)");
uiDefButS(block, NUM, B_PART_REDRAW, "Render:",
butx,(buty-=buth),butw,buth, &part->ren_step, 0.0, 9.0, 0, 0, "How many steps
paths are rendered with (power of 2)");
- uiDefButBitI(block, TOG, PART_ABS_LENGTH,
B_PART_RECALC, "Abs Length", butx,(buty-=buth),butw,buth, &part->flag, 0, 0,
0, 0, "Use maximum length in absolute blender units");
- uiDefButF(block, NUM, B_PART_RECALC, "Max
Length:", butx,(buty-=buth),butw,buth, &part->abslength, 0.0,
10000.0, 1, 3, "Absolute path length");
+ uiDefButBitI(block, TOG, PART_ABS_LENGTH,
B_PART_RECALC, "Abs Length", butx,(buty-=buth),butw,buth, &part->flag, 0, 0,
0, 0, "Use maximum length for children");
+ uiDefButF(block, NUM, B_PART_RECALC, "Max
Length:", butx,(buty-=buth),butw,buth, &part->abslength, 0.0,
10000.0, 1, 3, "Absolute maximum path length for children, in blender units");
uiDefButF(block, NUMSLI, B_PART_RECALC,
"RLength:", butx,(buty-=buth),butw,buth, &part->randlength, 0.0,
1.0, 1, 3, "Give path length a random variation");
uiBlockEndAlign(block);
Modified: branches/cloth/blender/source/blender/src/drawobject.c
===================================================================
--- branches/cloth/blender/source/blender/src/drawobject.c 2008-05-07
17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/src/drawobject.c 2008-05-07
17:51:33 UTC (rev 14725)
@@ -2425,19 +2425,23 @@
if (draw_wire) {
/* If drawing wire and drawtype is not OB_WIRE then we
are
* overlaying the wires.
+ *
+ * UPDATE bug #10290 - With this wire-only
objects can draw
+ * behind other objects depending on their order
in the scene. 2x if 0's below. undo'ing zr's commit: r4059
*/
-
+#if 0
if (dt!=OB_WIRE) {
bglPolygonOffset(1.0);
glDepthMask(0); // disable write in zbuffer, selected
edge wires show better
}
-
+#endif
dm->drawEdges(dm, (dt==OB_WIRE || totface==0));
-
+#if 0
if (dt!=OB_WIRE) {
glDepthMask(1);
bglPolygonOffset(0.0);
}
+#endif
}
dm->release(dm);
@@ -2485,7 +2489,7 @@
}
/* init_gl_materials did the proper checking if this is needed */
- if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP);
+ if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP, flag);
return retval;
}
@@ -4663,7 +4667,7 @@
if(!(G.f & G_PARTICLEEDIT)) {
/* xray and transp are set when it is drawing the
2nd/3rd pass */
if(!G.vd->xray && !G.vd->transp && (ob->dtx &
OB_DRAWXRAY)) {
- add_view3d_after(G.vd, base, V3D_XRAY);
+ add_view3d_after(G.vd, base, V3D_XRAY, flag);
return;
}
}
Modified: branches/cloth/blender/source/blender/src/drawview.c
===================================================================
--- branches/cloth/blender/source/blender/src/drawview.c 2008-05-07
17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/src/drawview.c 2008-05-07
17:51:33 UTC (rev 14725)
@@ -2663,21 +2663,22 @@
typedef struct View3DAfter {
struct View3DAfter *next, *prev;
struct Base *base;
- int type;
+ int type, flag;
} View3DAfter;
/* temp storage of Objects that need to be drawn as last */
-void add_view3d_after(View3D *v3d, Base *base, int type)
+void add_view3d_after(View3D *v3d, Base *base, int type, int flag)
{
View3DAfter *v3da= MEM_callocN(sizeof(View3DAfter), "View 3d after");
BLI_addtail(&v3d->afterdraw, v3da);
v3da->base= base;
v3da->type= type;
+ v3da->flag= flag;
}
/* clears zbuffer and draws it over */
-static void view3d_draw_xray(View3D *v3d, int flag)
+static void view3d_draw_xray(View3D *v3d)
{
View3DAfter *v3da, *next;
int doit= 0;
@@ -2692,7 +2693,7 @@
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
next= v3da->next;
if(v3da->type==V3D_XRAY) {
- draw_object(v3da->base, flag);
+ draw_object(v3da->base, v3da->flag);
BLI_remlink(&v3d->afterdraw, v3da);
MEM_freeN(v3da);
}
@@ -2702,7 +2703,7 @@
}
/* disables write in zbuffer and draws it over */
-static void view3d_draw_transp(View3D *v3d, int flag)
+static void view3d_draw_transp(View3D *v3d)
{
View3DAfter *v3da, *next;
@@ -2712,7 +2713,7 @@
for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
next= v3da->next;
if(v3da->type==V3D_TRANSP) {
- draw_object(v3da->base, flag);
+ draw_object(v3da->base, v3da->flag);
BLI_remlink(&v3d->afterdraw, v3da);
MEM_freeN(v3da);
}
@@ -3102,9 +3103,7 @@
}
}
- /* Transp and X-ray afterdraw stuff */
- view3d_draw_xray(v3d, DRAW_CONSTCOLOR); // clears zbuffer if it
is used!
- view3d_draw_transp(v3d, DRAW_CONSTCOLOR);
+ /* Transp and X-ray afterdraw stuff for sets is done later */
}
/* then draw not selected and the duplis, but skip editmode object */
@@ -3150,8 +3149,8 @@
if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
/* Transp and X-ray afterdraw stuff */
- view3d_draw_xray(v3d, 0); // clears zbuffer if it is used!
- view3d_draw_transp(v3d, 0);
+ view3d_draw_xray(v3d); // clears zbuffer if it is used!
+ view3d_draw_transp(v3d);
if(!retopo && sculptparticle && (obact && (OBACT->dtx & OB_DRAWXRAY))) {
if(G.f & G_SCULPTMODE)
@@ -3327,9 +3326,7 @@
}
}
- /* Transp and X-ray afterdraw stuff */
- view3d_draw_xray(v3d, DRAW_CONSTCOLOR); // clears zbuffer if it
is used!
- view3d_draw_transp(v3d, DRAW_CONSTCOLOR);
+ /* Transp and X-ray afterdraw stuff for sets is done later */
}
/* first not selected and duplis */
@@ -3367,8 +3364,8 @@
if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
/* Transp and X-ray afterdraw stuff */
- view3d_draw_xray(v3d, 0); // clears zbuffer if it is used!
- view3d_draw_transp(v3d, 0);
+ view3d_draw_xray(v3d); // clears zbuffer if it is used!
+ view3d_draw_transp(v3d);
if(v3d->flag & V3D_CLIPPING)
view3d_clr_clipping();
Modified: branches/cloth/blender/source/blender/src/filesel.c
===================================================================
--- branches/cloth/blender/source/blender/src/filesel.c 2008-05-07 17:44:46 UTC
(rev 14724)
+++ branches/cloth/blender/source/blender/src/filesel.c 2008-05-07 17:51:33 UTC
(rev 14725)
@@ -1299,6 +1299,27 @@
sfile->ipotype= fromcode;
}
+/* resets a previous file space type */
+/* is used when opening a filebrowser directly from windowtype_pupmenu,
+ since in that case we don't want any load/save/append/link action
+*/
+void reset_filespace(ScrArea *sa)
+{
+ if (sa->spacetype == SPACE_FILE) {
+ SpaceFile *sfile= sa->spacedata.first;
+
+ if(sfile->type==FILE_MAIN) {
+ freefilelist(sfile);
+ } else {
+ sfile->type= FILE_UNIX;
+ }
+
+ sfile->returnfunc= NULL;
+ sfile->title[0]= 0;
+ if(sfile->filelist) test_flags_file(sfile);
+ }
+}
+
void filesel_prevspace()
{
SpaceFile *sfile= curarea->spacedata.first;
Modified: branches/cloth/blender/source/blender/src/headerbuttons.c
===================================================================
--- branches/cloth/blender/source/blender/src/headerbuttons.c 2008-05-07
17:44:46 UTC (rev 14724)
+++ branches/cloth/blender/source/blender/src/headerbuttons.c 2008-05-07
17:51:33 UTC (rev 14725)
@@ -1434,6 +1434,8 @@
break;
case B_NEWSPACE:
newspace(curarea, curarea->butspacetype);
+ reset_filespace(curarea);
+ reset_imaselspace(curarea);
break;
case B_LOADTEMP: /* is button from space.c */
BIF_read_autosavefile();
Modified: branches/cloth/blender/source/blender/src/imasel.c
===================================================================
--- branches/cloth/blender/source/blender/src/imasel.c 2008-05-07 17:44:46 UTC
(rev 14724)
+++ branches/cloth/blender/source/blender/src/imasel.c 2008-05-07 17:51:33 UTC
(rev 14725)
@@ -80,3 +80,26 @@
}
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
