date:20080820

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16200] branches/harmonic-skeleton/source/ blender: transfering some ongoing work for home, nothing to see here.

2008-08-20 Thread Martin Poirier

Revision: 16200
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16200
Author:   theeth
Date: 2008-08-20 23:34:49 +0200 (Wed, 20 Aug 2008)

Log Message:
---
transfering some ongoing work for home, nothing to see here.

Modified Paths:
--
branches/harmonic-skeleton/source/blender/blenlib/intern/graph.c
branches/harmonic-skeleton/source/blender/include/reeb.h
branches/harmonic-skeleton/source/blender/src/autoarmature.c
branches/harmonic-skeleton/source/blender/src/reeb.c

Modified: branches/harmonic-skeleton/source/blender/blenlib/intern/graph.c
===
--- branches/harmonic-skeleton/source/blender/blenlib/intern/graph.c
2008-08-20 20:49:32 UTC (rev 16199)
+++ branches/harmonic-skeleton/source/blender/blenlib/intern/graph.c
2008-08-20 21:34:49 UTC (rev 16200)
@@ -100,12 +100,12 @@
node->flag++;
 }
 
-void BLI_buildAdjacencyList(BGraph *rg)
+void BLI_buildAdjacencyList(BGraph *graph)
 {
BNode *node;
BArc *arc;
 
-   for(node = rg->nodes.first; node; node = node->next)
+   for(node = graph->nodes.first; node; node = node->next)
{
if (node->arcs != NULL)
{
@@ -118,13 +118,13 @@
node->flag = 0;
}
 
-   for(arc = rg->arcs.first; arc; arc= arc->next)
+   for(arc = graph->arcs.first; arc; arc= arc->next)
{
addArcToNodeAdjacencyList(arc->head, arc);
addArcToNodeAdjacencyList(arc->tail, arc);
}
 
-   for(node = rg->nodes.first; node; node = node->next)
+   for(node = graph->nodes.first; node; node = node->next)
{
if (node->degree != node->flag)
{
@@ -133,7 +133,7 @@
}
 }
 
-void BLI_rebuildAdjacencyListForNode(BGraph* rg, BNode *node)
+void BLI_rebuildAdjacencyListForNode(BGraph* graph, BNode *node)
 {
BArc *arc;
 
@@ -147,7 +147,7 @@
/* temporary use to indicate the first index available in the lists */
node->flag = 0;
 
-   for(arc = rg->arcs.first; arc; arc= arc->next)
+   for(arc = graph->arcs.first; arc; arc= arc->next)
{
if (arc->head == node)
{
@@ -165,11 +165,11 @@
}
 }
 
-void BLI_freeAdjacencyList(BGraph *rg)
+void BLI_freeAdjacencyList(BGraph *graph)
 {
BNode *node;
 
-   for(node = rg->nodes.first; node; node = node->next)
+   for(node = graph->nodes.first; node; node = node->next)
{
if (node->arcs != NULL)
{
@@ -179,11 +179,11 @@
}
 }
 
-int BLI_hasAdjacencyList(BGraph *rg)
+int BLI_hasAdjacencyList(BGraph *graph)
 {
BNode *node;

-   for(node = rg->nodes.first; node; node = node->next)
+   for(node = graph->nodes.first; node; node = node->next)
{
if (node->arcs == NULL)
{
@@ -233,12 +233,14 @@
if (arc->head == node_replaced)
{
arc->head = node_src;
+   node_replaced->degree--;
node_src->degree++;
}
 
if (arc->tail == node_replaced)
{
arc->tail = node_src;
+   node_replaced->degree--;
node_src->degree++;
}


Modified: branches/harmonic-skeleton/source/blender/include/reeb.h
===
--- branches/harmonic-skeleton/source/blender/include/reeb.h2008-08-20 
20:49:32 UTC (rev 16199)
+++ branches/harmonic-skeleton/source/blender/include/reeb.h2008-08-20 
21:34:49 UTC (rev 16200)
@@ -53,6 +53,7 @@
int resolution;
int totnodes;
struct EdgeHash *emap;
+   int multi_level;
struct ReebGraph *link_up; /* for multi resolution filtering, points to 
higher levels */
 } ReebGraph;
 
@@ -79,6 +80,7 @@
 
int index;
float weight;
+   int multi_level;
struct ReebNode *link_down; /* for multi resolution filtering, points 
to lower levels, if present */
struct ReebNode *link_up;
 } ReebNode;
@@ -177,6 +179,8 @@
 ReebNode *BIF_NodeFromIndex(ReebArc *arc, ReebNode *node);
 ReebNode *BIF_lowestLevelNode(ReebNode *node);
 
+ReebGraph *BIF_graphForMultiNode(ReebGraph *rg, ReebNode *node);
+
 void REEB_freeGraph(ReebGraph *rg);
 void REEB_exportGraph(ReebGraph *rg, int count);
 void REEB_draw();

Modified: branches/harmonic-skeleton/source/blender/src/autoarmature.c
===
--- branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-08-20 20:49:32 UTC (rev 16199)
+++ branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-08-20 21:34:49 UTC (rev 16200)
@@ -1833,13 +1833,12 @@
 
 static void

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16199] branches/soc-2008-unclezeiv/source /blender/render/intern/source/convertblender.c: fixed bug that would crash lightcuts if lamps with sampling

2008-08-20 Thread Davide Vercelli

Revision: 16199
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16199
Author:   unclezeiv
Date: 2008-08-20 22:49:32 +0200 (Wed, 20 Aug 2008)

Log Message:
---
fixed bug that would crash lightcuts if lamps with sampling > 1 are present 
(lightcuts uses single sampling anyway)

Modified Paths:
--

branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c

Modified: 
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
===
--- 
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
2008-08-20 20:10:33 UTC (rev 16198)
+++ 
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
2008-08-20 20:49:32 UTC (rev 16199)
@@ -3569,6 +3569,9 @@
 
// area
lar->ray_samp= la->ray_samp;
+   /* lightcuts uses single sampling and LA_SAMP_CONSTANT, override here 
to avoid crashes */
+   if (re->r.mode & R_LIGHTCUTS)
+   lar->ray_samp= 1;
lar->ray_sampy= la->ray_sampy;
lar->ray_sampz= la->ray_sampz;



___
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 [16198] trunk/blender/release/scripts: -> more FLT tweaks

2008-08-20 Thread Geoffrey Bantle

Revision: 16198
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16198
Author:   briggs
Date: 2008-08-20 22:10:33 +0200 (Wed, 20 Aug 2008)

Log Message:
---
-> more FLT tweaks

LOD editor input ranges were too low.
Also fixed the interface drawing so it
always started at bottom of screen area.

Modified Paths:
--
trunk/blender/release/scripts/flt_dofedit.py
trunk/blender/release/scripts/flt_lodedit.py

Modified: trunk/blender/release/scripts/flt_dofedit.py
===
--- trunk/blender/release/scripts/flt_dofedit.py2008-08-20 19:18:52 UTC 
(rev 16197)
+++ trunk/blender/release/scripts/flt_dofedit.py2008-08-20 20:10:33 UTC 
(rev 16198)
@@ -685,12 +685,13 @@
input_width = 100
pad = 10
origx = x
-   origy = y
+   origy = (row_height * 15) + (pad * 15)
 
 
#editor label
x = origx
-   y = y - (row_height + pad)
+   y = origy
+   #y = y - (row_height + pad)
DOF_EDITLABEL = Blender.Draw.Label("FLT Degree of Freedom Editor", x, 
y, 200, row_height)
 
 
@@ -705,33 +706,33 @@
y = y- (row_height + pad)
DOF_TRANSX = Blender.Draw.Toggle("LimX", evcode["DOF_TRANSX"], x, y, 
toggle_width, row_height, get_lockmask(lockxtrans), "")
x = x + (toggle_width + pad)
-   DOF_MIN_TRANSX = Blender.Draw.Number("MinX", evcode["DOF_MIN_TRANSX"], 
x, y, input_width, row_height,get_prop(14,xmin),  -100.0, 100.0, "")
+   DOF_MIN_TRANSX = Blender.Draw.Number("MinX", evcode["DOF_MIN_TRANSX"], 
x, y, input_width, row_height,get_prop(14,xmin),  -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_MAX_TRANSX = Blender.Draw.Number("MaxX", evcode["DOF_MAX_TRANSX"], 
x, y, input_width, row_height,get_prop(14,xmax), -100.0, 100.0, "")
+   DOF_MAX_TRANSX = Blender.Draw.Number("MaxX", evcode["DOF_MAX_TRANSX"], 
x, y, input_width, row_height,get_prop(14,xmax), -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_STEP_TRANSX = Blender.Draw.Number("StepX", 
evcode["DOF_STEP_TRANSX"], x, y, input_width, row_height,get_prop(14,xstep), 
-100.0, 100.0, "")
+   DOF_STEP_TRANSX = Blender.Draw.Number("StepX", 
evcode["DOF_STEP_TRANSX"], x, y, input_width, row_height,get_prop(14,xstep), 
-100.0, 100.0, "")

#Y limits
x = origx
y = y- (row_height + pad)
DOF_TRANSY = Blender.Draw.Toggle("LimY", evcode["DOF_TRANSY"], x, y, 
toggle_width, row_height, get_lockmask(lockytrans), "")
x = x + (toggle_width + pad)
-   DOF_MIN_TRANSY = Blender.Draw.Number("MinY", evcode["DOF_MIN_TRANSY"], 
x, y, input_width, row_height, get_prop(14,ymin),  -100.0, 100.0, "")
+   DOF_MIN_TRANSY = Blender.Draw.Number("MinY", evcode["DOF_MIN_TRANSY"], 
x, y, input_width, row_height, get_prop(14,ymin),  -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_MAX_TRANSY = Blender.Draw.Number("MaxY", evcode["DOF_MAX_TRANSY"], 
x, y, input_width, row_height, get_prop(14,ymax), -100.0, 100.0, "")
+   DOF_MAX_TRANSY = Blender.Draw.Number("MaxY", evcode["DOF_MAX_TRANSY"], 
x, y, input_width, row_height, get_prop(14,ymax), -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_STEP_TRANSY = Blender.Draw.Number("StepY", 
evcode["DOF_STEP_TRANSY"], x, y, input_width, row_height, get_prop(14,ystep), 
-100.0, 100.0, "") 
+   DOF_STEP_TRANSY = Blender.Draw.Number("StepY", 
evcode["DOF_STEP_TRANSY"], x, y, input_width, row_height, get_prop(14,ystep), 
-100.0, 100.0, "") 

#Z limits
x = origx
y = y- (row_height + pad)
DOF_TRANSZ = Blender.Draw.Toggle("LimZ", evcode["DOF_TRANSZ"], x, y, 
toggle_width, row_height, get_lockmask(lockztrans), "")
x = x + (toggle_width + pad)
-   DOF_MIN_TRANSZ = Blender.Draw.Number("MinZ", evcode["DOF_MIN_TRANSZ"], 
x, y, input_width, row_height, get_prop(14,zmin),  -100.0, 100.0, "")
+   DOF_MIN_TRANSZ = Blender.Draw.Number("MinZ", evcode["DOF_MIN_TRANSZ"], 
x, y, input_width, row_height, get_prop(14,zmin),  -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_MAX_TRANSZ = Blender.Draw.Number("MaxZ", evcode["DOF_MAX_TRANSZ"], 
x, y, input_width, row_height, get_prop(14,zmax), -100.0, 100.0, "")
+   DOF_MAX_TRANSZ = Blender.Draw.Number("MaxZ", evcode["DOF_MAX_TRANSZ"], 
x, y, input_width, row_height, get_prop(14,zmax), -100.0, 100.0, "")
x = x + (input_width + pad)
-   DOF_STEP_TRANSZ = Blender.Draw.Number("StepZ", 
evcode["DOF_STEP_TRANSZ"], x, y, input_width, row_height, get_prop(14,zstep), 
-100.0, 100.0, "")
+   DOF_STEP_TRANSZ = Blender.Draw.Number("StepZ", 
evcode["DOF_STEP_TRANSZ"], x, y, input_width, row_height, get_prop(14,zstep), 
-100.0, 100.0, "")

#draw Rotation limits
x = origx
@@ -744,33 +745,33 @@
y

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16197] trunk/blender/release/scripts/ flt_lodedit.py: -> Fix for last commit

2008-08-20 Thread Geoffrey Bantle

Revision: 16197
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16197
Author:   briggs
Date: 2008-08-20 21:18:52 +0200 (Wed, 20 Aug 2008)

Log Message:
---
-> Fix for last commit

 The range of allowed values for the LOD editor
 inputs was too low.

Modified Paths:
--
trunk/blender/release/scripts/flt_lodedit.py

Modified: trunk/blender/release/scripts/flt_lodedit.py
===
--- trunk/blender/release/scripts/flt_lodedit.py2008-08-20 19:10:33 UTC 
(rev 16196)
+++ trunk/blender/release/scripts/flt_lodedit.py2008-08-20 19:18:52 UTC 
(rev 16197)
@@ -440,17 +440,17 @@
y = y- (row_height + pad)
LOD_XLABEL = Blender.Draw.Label("X Coordinate", x, y, label_width, 
row_height)
x = origx + (label_width + pad)
-   LOD_X = Blender.Draw.Number("", evcode["LOD_X"], x, y, input_width, 
row_height,get_prop(73,xco),  -100.0, 100.0, "")
+   LOD_X = Blender.Draw.Number("", evcode["LOD_X"], x, y, input_width, 
row_height,get_prop(73,xco),  -100.0, 100.0, "")
x = origx
y = y- (row_height + pad)
LOD_YLABEL = Blender.Draw.Label("Y Coordinate", x, y, label_width, 
row_height)  
x = origx + (label_width + pad)
-   LOD_Y = Blender.Draw.Number("", evcode["LOD_Y"], x, y, input_width, 
row_height,get_prop(73,yco), -100.0, 100.0, "")
+   LOD_Y = Blender.Draw.Number("", evcode["LOD_Y"], x, y, input_width, 
row_height,get_prop(73,yco), -100.0,  100.0, "")
x = origx
y = y- (row_height + pad)
LOD_ZLABEL = Blender.Draw.Label("Z Coordinate", x, y, label_width, 
row_height)
x = origx + (label_width + pad) 
-   LOD_Z = Blender.Draw.Number("", evcode["LOD_Z"], x, y, input_width, 
row_height,get_prop(73,zco), -100.0, 100.0, "")
+   LOD_Z = Blender.Draw.Number("", evcode["LOD_Z"], x, y, input_width, 
row_height,get_prop(73,zco), -100.0, 100.0, "")
 
 
#Switch inputs
@@ -460,22 +460,22 @@
y = y- (row_height + pad)
LOD_SIGLABEL = Blender.Draw.Label("Significant Size", x, y, 
label_width, row_height)
x = origx + (label_width + pad)
-   LOD_SIG = Blender.Draw.Number("", evcode["LOD_SIG"], x, y, input_width, 
row_height, get_prop(73,sig_size),  -100.0, 100.0, "")
+   LOD_SIG = Blender.Draw.Number("", evcode["LOD_SIG"], x, y, input_width, 
row_height, get_prop(73,sig_size),  -100.0, 100.0, "")
x = origx
y = y- (row_height + pad)
LOD_INLABEL = Blender.Draw.Label("Switch In", x, y, label_width, 
row_height)
x = origx + (label_width + pad)
-   LOD_IN = Blender.Draw.Number("", evcode["LOD_IN"], x, y, input_width, 
row_height, get_prop(73,switch_in), -100.0, 100.0, "")
+   LOD_IN = Blender.Draw.Number("", evcode["LOD_IN"], x, y, input_width, 
row_height, get_prop(73,switch_in), -100.0, 100.0, "")
x = origx
y = y- (row_height + pad)
LOD_OUTLABEL = Blender.Draw.Label("Switch Out", x, y, label_width, 
row_height)  
x = origx + (label_width + pad)
-   LOD_OUT = Blender.Draw.Number("", evcode["LOD_OUT"], x, y, input_width, 
row_height, get_prop(73,switch_out), -100.0, 100.0, "")
+   LOD_OUT = Blender.Draw.Number("", evcode["LOD_OUT"], x, y, input_width, 
row_height, get_prop(73,switch_out), -100.0, 100.0, "")
x = origx
y = y- (row_height + pad)
LOD_TRANSLABEL = Blender.Draw.Label("Transition", x, y, label_width, 
row_height)
x = origx + (label_width + pad)
-   LOD_TRANS = Blender.Draw.Number("", evcode["LOD_TRANS"], x, y, 
input_width, row_height, get_prop(73,trans), -100.0, 100.0, "")  
+   LOD_TRANS = Blender.Draw.Number("", evcode["LOD_TRANS"], x, y, 
input_width, row_height, get_prop(73,trans), -100.0, 100.0, "")  
 
 
x = origx


___
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 [16196] trunk/blender/release/scripts: -> LOD and DOF editor scripts

2008-08-20 Thread Geoffrey Bantle

Revision: 16196
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16196
Author:   briggs
Date: 2008-08-20 21:10:33 +0200 (Wed, 20 Aug 2008)

Log Message:
---
-> LOD and DOF editor scripts

 Two new scripts for the 'Misc' Menu. LOD and DOF
 Editors for creating/editing DOF and LOD FLT nodes
 inside of blender.

Modified Paths:
--
trunk/blender/release/scripts/flt_properties.py

Added Paths:
---
trunk/blender/release/scripts/flt_dofedit.py
trunk/blender/release/scripts/flt_lodedit.py

Added: trunk/blender/release/scripts/flt_dofedit.py
===
--- trunk/blender/release/scripts/flt_dofedit.py
(rev 0)
+++ trunk/blender/release/scripts/flt_dofedit.py2008-08-20 19:10:33 UTC 
(rev 16196)
@@ -0,0 +1,834 @@
+#!BPY
+
+"""
+Name: 'FLT DOF Editor'
+Blender: 240
+Group: 'Misc'
+Tooltip: 'Degree of Freedom editor for FLT nodes'
+"""
+
+__author__ = "Geoffrey Bantle"
+__version__ = "1.0 11/21/07"
+__email__ = ('scripts', 'Author, ')
+__url__ = ('blender', 'blenderartists.org')
+
+__bpydoc__ ="""\
+This script provides tools for working with OpenFlight databases in Blender. 
OpenFlight is a
+registered trademark of MultiGen-Paradigm, Inc.
+
+Feature overview and more availible at:
+http://wiki.blender.org/index.php/Scripts/Manual/FLTools
+"""
+
+# --
+# flt_palettemanager.py version 0.1 2005/04/08
+# --
+# * BEGIN GPL LICENSE BLOCK *
+#
+# Copyright (C) 2007: Blender Foundation
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# * END GPL LICENCE BLOCK *
+# --
+
+import Blender.Draw as Draw
+from Blender.BGL import *
+import Blender
+import flt_properties
+reload(flt_properties)
+from flt_properties import *
+
+#event codes
+evcode = {
+   "DOF_MAKE" : 100,
+   "DOF_UPDATE" : 138,
+   "DOF_DELETE" : 101,
+   "DOF_TRANSX" : 102,
+   "DOF_TRANSY" : 103,
+   "DOF_TRANSZ" : 104,
+   "DOF_ROTX" : 105,
+   "DOF_ROTY" : 106,
+   "DOF_ROTZ" : 107,
+   "DOF_SCALEX" : 108,
+   "DOF_SCALEY" : 109,
+   "DOF_SCALEZ" : 110,
+   "DOF_MIN_TRANSX" : 111,
+   "DOF_MIN_TRANSY" : 112,
+   "DOF_MIN_TRANSZ" : 113,
+   "DOF_MIN_ROTX" : 114,
+   "DOF_MIN_ROTY" : 115,
+   "DOF_MIN_ROTZ" : 116,
+   "DOF_MIN_SCALEX" : 117,
+   "DOF_MIN_SCALEY" : 118,
+   "DOF_MIN_SCALEZ" : 119,
+   "DOF_MAX_TRANSX" : 120,
+   "DOF_MAX_TRANSY" : 121,
+   "DOF_MAX_TRANSZ" : 122,
+   "DOF_MAX_ROTX" : 123,
+   "DOF_MAX_ROTY" : 124,
+   "DOF_MAX_ROTZ" : 125,
+   "DOF_MAX_SCALEX" : 126,
+   "DOF_MAX_SCALEY" : 127,
+   "DOF_MAX_SCALEZ" : 128,
+   "DOF_STEP_TRANSX" : 129,
+   "DOF_STEP_TRANSY" : 130,
+   "DOF_STEP_TRANSZ" : 131,
+   "DOF_STEP_ROTX" : 132,
+   "DOF_STEP_ROTY" : 133,
+   "DOF_STEP_ROTZ" : 134,
+   "DOF_STEP_SCALEX" : 135,
+   "DOF_STEP_SCALEY" : 136,
+   "DOF_STEP_SCALEZ" : 137
+}
+
+#system
+DOF_MAKE = None
+DOF_UPDATE = None
+DOF_DELETE = None
+
+#toggle buttons
+DOF_TRANSX = None
+DOF_TRANSY = None
+DOF_TRANSZ = None
+DOF_ROTX = None
+DOF_ROTY = None
+DOF_ROTZ = None
+DOF_SCALEX = None
+DOF_SCALEY = None
+DOF_SCALEZ = None
+
+#Minimums
+DOF_MIN_TRANSX = None
+DOF_MIN_TRANSY = None
+DOF_MIN_TRANSZ = None
+DOF_MIN_ROTX = None
+DOF_MIN_ROTY = None
+DOF_MIN_ROTZ = None
+DOF_MIN_SCALEX = None
+DOF_MIN_SCALEY = None
+DOF_MIN_SCALEZ = None
+
+#maximums
+DOF_MAX_TRANSX = None
+DOF_MAX_TRANSY = None
+DOF_MAX_TRANSZ = None
+DOF_MAX_ROTX = None
+DOF_MAX_ROTY = None
+DOF_MAX_ROTZ = None
+DOF_MAX_SCALEX = None
+DOF_MAX_SCALEY = None
+DOF_MAX_SCALEZ = None
+
+#step
+DOF_STEP_TRANSX = None
+DOF_STEP_TRANSY = None
+DOF_STEP_TRANSZ = None
+DOF_STEP_ROTX = None
+DOF_STEP_ROTY = None
+DOF_STEP_ROTZ = None
+DOF_STEP_SCALEX = None
+DOF_STEP_SCALEY = None
+DOF_STEP_SCALEZ = None
+
+#labels
+DOF_ROTSTRING = None
+DOF_TRANSTRING = None
+DOF_SCALESTRING = None
+DOF_EDITLABEL = None
+
+#make ID props easier/morereadable
+zmin = '14d!ZMIN'
+zmax = '15d

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16195] branches/apricot/source: Apricot Branch

2008-08-20 Thread Brecht Van Lommel

Revision: 16195
  
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16195
Author:   blendix
Date: 2008-08-20 18:29:55 +0200 (Wed, 20 Aug 2008)

Log Message:
---
Apricot Branch
==

* Make lights and shadows work better with dupligroups, also in
  the game engine. Previously only one dupli would be created,
  and shadows didn't work well at all.
* Make normal maps + stencil work.
* Some glsl refresh and default material fixes.

Modified Paths:
--
branches/apricot/source/blender/blenkernel/intern/material.c
branches/apricot/source/blender/blenkernel/intern/object.c
branches/apricot/source/blender/blenloader/intern/readfile.c
branches/apricot/source/blender/gpu/GPU_material.h
branches/apricot/source/blender/gpu/intern/gpu_codegen.c
branches/apricot/source/blender/gpu/intern/gpu_draw.c
branches/apricot/source/blender/gpu/intern/gpu_material.c
branches/apricot/source/blender/makesdna/DNA_object_types.h
branches/apricot/source/blender/src/drawscene.c
branches/apricot/source/blender/src/drawview.c
branches/apricot/source/blender/src/previewrender.c
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.h
branches/apricot/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/apricot/source/gameengine/Ketsji/KX_Light.cpp
branches/apricot/source/gameengine/Ketsji/KX_Light.h
branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp

Modified: branches/apricot/source/blender/blenkernel/intern/material.c
===
--- branches/apricot/source/blender/blenkernel/intern/material.c
2008-08-20 06:11:11 UTC (rev 16194)
+++ branches/apricot/source/blender/blenkernel/intern/material.c
2008-08-20 16:29:55 UTC (rev 16195)
@@ -100,7 +100,7 @@
}
 
if(ma->gpumaterial)
-   GPU_material_free(ma->gpumaterial);
+   GPU_material_free(ma);
 }
 
 void init_material(Material *ma)

Modified: branches/apricot/source/blender/blenkernel/intern/object.c
===
--- branches/apricot/source/blender/blenkernel/intern/object.c  2008-08-20 
06:11:11 UTC (rev 16194)
+++ branches/apricot/source/blender/blenkernel/intern/object.c  2008-08-20 
16:29:55 UTC (rev 16195)
@@ -270,7 +270,7 @@
}
if(ob->soft) sbFree(ob->soft);
if(ob->fluidsimSettings) fluidsimSettingsFree(ob->fluidsimSettings);
-   if(ob->gpulamp) GPU_lamp_free(ob->gpulamp);
+   if(ob->gpulamp.first) GPU_lamp_free(ob);
 }
 
 static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, 
Object **obpoin)
@@ -1229,7 +1229,7 @@
obn->vnode = NULL;
 #endif
 
-   obn->gpulamp = NULL;
+   obn->gpulamp.first = obn->gpulamp.last = NULL;
 
return obn;
 }

Modified: branches/apricot/source/blender/blenloader/intern/readfile.c
===
--- branches/apricot/source/blender/blenloader/intern/readfile.c
2008-08-20 06:11:11 UTC (rev 16194)
+++ branches/apricot/source/blender/blenloader/intern/readfile.c
2008-08-20 16:29:55 UTC (rev 16195)
@@ -3400,7 +3400,7 @@
ob->bb= NULL;
ob->derivedDeform= NULL;
ob->derivedFinal= NULL;
-   ob->gpulamp= NULL;
+   ob->gpulamp.first= ob->gpulamp.last= NULL;
 }
 
 /*  READ SCENE * */

Modified: branches/apricot/source/blender/gpu/GPU_material.h
===
--- branches/apricot/source/blender/gpu/GPU_material.h  2008-08-20 06:11:11 UTC 
(rev 16194)
+++ branches/apricot/source/blender/gpu/GPU_material.h  2008-08-20 16:29:55 UTC 
(rev 16195)
@@ -120,7 +120,7 @@
 /* High level functions to create and use GPU materials */
 
 int GPU_material_from_blender(struct Scene *scene, struct Material *ma);
-void GPU_material_free(GPUMaterial *material);
+void GPU_material_free(struct Material *ma);
 
 void GPU_materials_free();
 
@@ -151,8 +151,8 @@
 
 /* Lamps */
 
-int GPU_lamp_from_blender(struct Object *ob, struct Lamp *la);
-void GPU_lamp_free(GPULamp *lamp);
+GPULamp *GPU_lamp_from_blender(struct Object *ob, struct Object *par);
+void GPU_lamp_free(struct Object *ob);
 
 int GPU_lamp_has_shadow_buffer(GPULamp *lamp);
 void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[][4], int 
*winsize, float winmat[][4]);

Modified: branches/apricot/source/blender/gpu/intern/gpu_codegen.c
===
--- branches/apricot/source/blender/gpu/intern/gpu_codegen.c2008-08-20 
06:11:11 UTC (rev 16194)
+++ branches/apricot/source/blender/gpu/intern/gpu_codegen.c2008-08-20 
16:29:55 UTC (rev 16195)
@@ -362,10 +362,8 @@
 {

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16200] branches/harmonic-skeleton/source/ blender: transfering some ongoing work for home, nothing to see here.

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16199] branches/soc-2008-unclezeiv/source /blender/render/intern/source/convertblender.c: fixed bug that would crash lightcuts if lamps with sampling

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16198] trunk/blender/release/scripts: -> more FLT tweaks

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16197] trunk/blender/release/scripts/ flt_lodedit.py: -> Fix for last commit

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16196] trunk/blender/release/scripts: -> LOD and DOF editor scripts

[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16195] branches/apricot/source: Apricot Branch

6 matches

Site Navigation

Mail list logo

Footer information