[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36657] branches/particles-2010/source/ blender: Bug in tree localization: need_exec must only be reset for compositor trees.
Revision: 36657
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36657
Author: lukastoenne
Date: 2011-05-13 06:52:51 + (Fri, 13 May 2011)
Log Message:
---
Bug in tree localization: need_exec must only be reset for compositor trees.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-13 05:45:18 UTC (rev 36656)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-13 06:52:51 UTC (rev 36657)
@@ -1130,11 +1130,8 @@
ntreeSetOutput(ntree);
for(node= ntree-nodes.first; node; node= node-next) {
-
/* store new_node pointer to original */
node-new_node-new_node= node;
- /* ensure new user input gets handled ok */
- node-need_exec= 0;
}
if (ntreetype-localize)
Modified:
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
===
---
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
2011-05-13 05:45:18 UTC (rev 36656)
+++
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
2011-05-13 06:52:51 UTC (rev 36657)
@@ -105,6 +105,9 @@
bNodeSocket *sock;
for(node= ntree-nodes.first; node; node= node-next) {
+ /* ensure new user input gets handled ok */
+ node-need_exec= 0;
+
/* move over the compbufs */
/* right after ntreeCopyTree() oldsock pointers are valid */
@@ -118,7 +121,6 @@
}
for(sock= node-outputs.first; sock; sock= sock-next) {
-
sock-new_sock-cache= sock-cache;
compbuf_set_node(sock-new_sock-cache, node-new_node);
___
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 [36658] branches/particles-2010: svn merge -r36492:36657 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36658 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36658 Author: lukastoenne Date: 2011-05-13 10:09:41 + (Fri, 13 May 2011) Log Message: --- svn merge -r36492:36657 https://svn.blender.org/svnroot/bf-blender/trunk/blender Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36492 Modified Paths: -- branches/particles-2010/CMakeLists.txt branches/particles-2010/SConstruct branches/particles-2010/build_files/cmake/macros.cmake branches/particles-2010/build_files/cmake/packaging.cmake branches/particles-2010/doc/doxygen/doxygen.source branches/particles-2010/doc/python_api/sphinx_doc_gen.py branches/particles-2010/intern/container/CMakeLists.txt branches/particles-2010/intern/container/CTR_Map.h branches/particles-2010/intern/container/SConscript branches/particles-2010/intern/ghost/CMakeLists.txt branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp branches/particles-2010/intern/iksolver/intern/IK_QSegment.cpp branches/particles-2010/intern/smoke/intern/Makefile.FFT branches/particles-2010/intern/smoke/intern/Makefile.cygwin branches/particles-2010/intern/smoke/intern/Makefile.linux branches/particles-2010/intern/smoke/intern/Makefile.mac branches/particles-2010/release/environment-mswindows branches/particles-2010/release/scripts/modules/bpy/path.py branches/particles-2010/release/scripts/modules/bpy/utils.py branches/particles-2010/release/scripts/modules/io_utils.py branches/particles-2010/release/scripts/startup/bl_ui/properties_data_camera.py branches/particles-2010/release/scripts/startup/bl_ui/properties_data_empty.py branches/particles-2010/release/scripts/startup/bl_ui/properties_data_modifier.py branches/particles-2010/release/scripts/startup/bl_ui/space_text.py branches/particles-2010/release/windows/installer/00.sconsblender.nsi branches/particles-2010/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/vs.py branches/particles-2010/source/CMakeLists.txt branches/particles-2010/source/SConscript branches/particles-2010/source/blender/CMakeLists.txt branches/particles-2010/source/blender/SConscript branches/particles-2010/source/blender/blenfont/CMakeLists.txt branches/particles-2010/source/blender/blenfont/intern/blf_dir.c branches/particles-2010/source/blender/blenfont/intern/blf_internal.h branches/particles-2010/source/blender/blenkernel/BKE_blender.h branches/particles-2010/source/blender/blenkernel/BKE_brush.h branches/particles-2010/source/blender/blenkernel/BKE_node.h branches/particles-2010/source/blender/blenkernel/BKE_sketch.h branches/particles-2010/source/blender/blenkernel/BKE_text.h branches/particles-2010/source/blender/blenkernel/CMakeLists.txt branches/particles-2010/source/blender/blenkernel/intern/brush.c branches/particles-2010/source/blender/blenkernel/intern/displist.c branches/particles-2010/source/blender/blenkernel/intern/node.c branches/particles-2010/source/blender/blenkernel/intern/object.c branches/particles-2010/source/blender/blenkernel/intern/particle_system.c branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c branches/particles-2010/source/blender/blenkernel/intern/sketch.c branches/particles-2010/source/blender/blenkernel/intern/text.c branches/particles-2010/source/blender/blenkernel/intern/texture.c branches/particles-2010/source/blender/blenlib/BLI_math_geom.h branches/particles-2010/source/blender/blenlib/CMakeLists.txt branches/particles-2010/source/blender/blenlib/intern/dynlib.c branches/particles-2010/source/blender/blenlib/intern/math_geom.c branches/particles-2010/source/blender/blenlib/intern/path_util.c branches/particles-2010/source/blender/blenlib/intern/rand.c branches/particles-2010/source/blender/blenloader/CMakeLists.txt branches/particles-2010/source/blender/blenloader/SConscript branches/particles-2010/source/blender/blenloader/intern/readblenentry.c branches/particles-2010/source/blender/blenloader/intern/readfile.c branches/particles-2010/source/blender/editors/animation/anim_filter.c branches/particles-2010/source/blender/editors/armature/armature_intern.h branches/particles-2010/source/blender/editors/armature/editarmature.c branches/particles-2010/source/blender/editors/armature/editarmature_sketch.c branches/particles-2010/source/blender/editors/curve/editcurve.c branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36659] branches/particles-2010/source/ blender/nodes: Update doxygen comments and header defines for moved and renamed node files .
Revision: 36659 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36659 Author: lukastoenne Date: 2011-05-13 10:37:58 + (Fri, 13 May 2011) Log Message: --- Update doxygen comments and header defines for moved and renamed node files. Modified Paths: -- branches/particles-2010/source/blender/nodes/NOD_composite.h branches/particles-2010/source/blender/nodes/NOD_shader.h branches/particles-2010/source/blender/nodes/NOD_socket.h branches/particles-2010/source/blender/nodes/NOD_texture.h branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c branches/particles-2010/source/blender/nodes/composite/node_composite_util.c branches/particles-2010/source/blender/nodes/composite/node_composite_util.h branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_alphaOver.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_blur.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_brightness.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_channelMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_colorMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_colorSpill.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_colorbalance.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_common.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_composite.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_crop.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_curves.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_defocus.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_diffMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_dilate.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_directionalblur.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_displace.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_filter.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_flip.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_gamma.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_glare.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_huecorrect.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_idMask.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_image.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_invert.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_lensdist.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_levels.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_mapUV.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_mapValue.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_math.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_mixrgb.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_normal.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_normalize.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_outputFile.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_premulkey.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rotate.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_scale.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36663] branches/bmesh/blender/source/ blender: fix for last commit and remove some unused variables.
Revision: 36663
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36663
Author: campbellbarton
Date: 2011-05-13 11:34:55 + (Fri, 13 May 2011)
Log Message:
---
fix for last commit and remove some unused variables.
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-05-13 11:34:55 UTC (rev 36663)
@@ -358,7 +358,6 @@
void DM_DupPolys(DerivedMesh *source, DerivedMesh *target)
{
DMFaceIter *iter = source-newFaceIter(source);
- DMLoopIter *liter;
int totloop = source-numLoopData;
dm_add_polys_from_iter(target-loopData, target-polyData, source,
totloop);
@@ -921,7 +920,7 @@
static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm)
{
- Mesh *me = ob-data;
+ // Mesh *me = ob-data; // UNUSED
MFace *mf = dm-getTessFaceArray(dm);
DMFaceIter *dfiter;
DMLoopIter *dliter;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-05-13 11:34:55 UTC (rev 36663)
@@ -121,7 +121,6 @@
static BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv,
BMEdge *starte) {
BMLoopList *lst = BLI_mempool_calloc(bm-looplistpool);
BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, f, NULL);
- int i;
bmesh_radial_append(starte, l);
@@ -356,8 +355,6 @@
}
static void bmesh_kill_loop(BMesh *bm, BMLoop *l) {
- int i;
-
bm-totloop--;
if (l-head.data)
CustomData_bmesh_free_block(bm-ldata, l-head.data);
@@ -407,8 +404,7 @@
void BM_Kill_Face(BMesh *bm, BMFace *f) {
BMLoopList *ls, *lsnext;
- int i;
-
+
CHECK_ELEMENT(bm, f);
for (ls=f-loops.first; ls; ls=lsnext) {
@@ -442,8 +438,7 @@
}
void BM_Kill_Edge(BMesh *bm, BMEdge *e) {
- int i;
-
+
bmesh_disk_remove_edge(e, e-v1);
bmesh_disk_remove_edge(e, e-v2);
@@ -934,7 +929,7 @@
BMLoop **rl, ListBase *holes)
{
- BMFace *f2, *of1, *of2;
+ BMFace *f2;
BMLoop *v1loop = NULL, *v2loop = NULL, *curloop, *f1loop=NULL,
*f2loop=NULL;
BMEdge *e;
BMLoopList *lst, *lst2;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
2011-05-13 11:34:55 UTC (rev 36663)
@@ -140,8 +140,8 @@
#endif
}
-#define ETAG_SET(e, v, nv) (v) == (e)-v1 ? (etags[BM_GetIndex((e))].newv1 =
(nv)) : (etags[BMINDEX_GET((e))].newv2 = (nv))
-#define ETAG_GET(e, v) ((v) == (e)-v1 ? (etags[BM_GetIndex((e))].newv1) :
(etags[BMINDEX_GET((e))].newv2))
+#define ETAG_SET(e, v, nv) (v) == (e)-v1 ? (etags[BM_GetIndex((e))].newv1 =
(nv)) : (etags[BM_GetIndex((e))].newv2 = (nv))
+#define ETAG_GET(e, v) ((v) == (e)-v1 ? (etags[BM_GetIndex((e))].newv1) :
(etags[BM_GetIndex((e))].newv2))
void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
{
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2011-05-13 11:10:30 UTC (rev 36662)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2011-05-13 11:34:55 UTC (rev 36663)
@@ -335,7 +335,8 @@
BMEdge *e;
BMEdge **edges = NULL;
BLI_array_staticdeclare(edges, 256);
- BMVert *v, *lastv, **verts = NULL;
+ BMVert *v, *lastv;
+ /*BMVert **verts = NULL; */
/*BLI_array_staticdeclare(verts, 256);*/ /*UNUSED*/
int i;
@@ -655,6 +656,7 @@
w += edata[BM_GetIndex(node-e)].ftag;
if (node-prev) {
/*BMESH_TODO*/
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36664] trunk/blender/build_files/scons: Option to use jemalloc when building with scons under linux.
Revision: 36664
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36664
Author: nazgul
Date: 2011-05-13 12:08:34 + (Fri, 13 May 2011)
Log Message:
---
Option to use jemalloc when building with scons under linux.
Disabled by default.
Modified Paths:
--
trunk/blender/build_files/scons/config/linux2-config.py
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/build_files/scons/tools/btools.py
Modified: trunk/blender/build_files/scons/config/linux2-config.py
===
--- trunk/blender/build_files/scons/config/linux2-config.py 2011-05-13
11:34:55 UTC (rev 36663)
+++ trunk/blender/build_files/scons/config/linux2-config.py 2011-05-13
12:08:34 UTC (rev 36664)
@@ -178,6 +178,14 @@
BF_EXPAT_LIB = 'expat'
BF_EXPAT_LIBPATH = '/usr/lib'
+WITH_BF_JEMALLOC = False
+WITH_BF_STATICJEMALLOC = False
+BF_JEMALLOC = '/usr'
+BF_JEMALLOC_INC = '${BF_JEMALLOC}/include'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
+BF_JEMALLOC_LIB = 'jemalloc'
+BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
+
WITH_BF_OPENMP = True
#Ray trace optimization
Modified: trunk/blender/build_files/scons/tools/Blender.py
===
--- trunk/blender/build_files/scons/tools/Blender.py2011-05-13 11:34:55 UTC
(rev 36663)
+++ trunk/blender/build_files/scons/tools/Blender.py2011-05-13 12:08:34 UTC
(rev 36664)
@@ -203,6 +203,11 @@
if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc',
'linuxcross'):
libincs.append('/usr/lib')
+if lenv['WITH_BF_JEMALLOC']:
+libincs += Split(lenv['BF_JEMALLOC_LIBPATH'])
+if lenv['WITH_BF_STATICJEMALLOC']:
+statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])
+
return statlibs, libincs
def setup_syslibs(lenv):
@@ -263,6 +268,9 @@
if not lenv['WITH_BF_STATICLIBSAMPLERATE']:
syslibs += Split(lenv['BF_LIBSAMPLERATE_LIB'])
+if lenv['WITH_BF_JEMALLOC']:
+if not lenv['WITH_BF_STATICJEMALLOC']:
+syslibs += Split(lenv['BF_JEMALLOC_LIB'])
syslibs += lenv['LLIBS']
Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2011-05-13 11:34:55 UTC
(rev 36663)
+++ trunk/blender/build_files/scons/tools/btools.py 2011-05-13 12:08:34 UTC
(rev 36664)
@@ -134,7 +134,8 @@
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
'BF_NO_ELBEEM',
-'WITH_BF_CXX_GUARDEDALLOC'
+'WITH_BF_CXX_GUARDEDALLOC',
+'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC',
'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB',
'BF_JEMALLOC_LIB_STATIC'
]
# Have options here that scons expects to be lists
@@ -429,6 +430,14 @@
('BF_EXPAT_LIB', 'Expat library', ''),
('BF_EXPAT_LIBPATH', 'Expat library path', ''),
+(BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
+(BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc',
False)),
+('BF_JEMALLOC', 'jemalloc base path', ''),
+('BF_JEMALLOC_INC', 'jemalloc include path', ''),
+('BF_JEMALLOC_LIB', 'jemalloc library', ''),
+('BF_JEMALLOC_LIBPATH', 'jemalloc library path', ''),
+('BF_JEMALLOC_LIB_STATIC', 'jemalloc static library', ''),
+
(BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true',
False)),
___
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 [36665] branches/cycles/source/blender/ editors/interface/interface_node.c: Cycles: fix node link remove from menu not working.
Revision: 36665 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36665 Author: blendix Date: 2011-05-13 12:10:03 + (Fri, 13 May 2011) Log Message: --- Cycles: fix node link remove from menu not working. Modified Paths: -- branches/cycles/source/blender/editors/interface/interface_node.c Modified: branches/cycles/source/blender/editors/interface/interface_node.c === --- branches/cycles/source/blender/editors/interface/interface_node.c 2011-05-13 12:08:34 UTC (rev 36664) +++ branches/cycles/source/blender/editors/interface/interface_node.c 2011-05-13 12:10:03 UTC (rev 36665) @@ -115,7 +115,7 @@ bNode *node, *next; bNodeSocket *sock; - if(!node) + if(!rem_node) return; /* tag linked nodes to be removed */ ___ 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 [36666] branches/cycles/intern/cycles: Cycles: fix BSDF closure inputs ignoring links.
Revision: 3
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=3
Author: blendix
Date: 2011-05-13 12:11:08 + (Fri, 13 May 2011)
Log Message:
---
Cycles: fix BSDF closure inputs ignoring links.
Modified Paths:
--
branches/cycles/intern/cycles/kernel/svm/svm.h
branches/cycles/intern/cycles/kernel/svm/svm_closure.h
branches/cycles/intern/cycles/render/nodes.cpp
Modified: branches/cycles/intern/cycles/kernel/svm/svm.h
===
--- branches/cycles/intern/cycles/kernel/svm/svm.h 2011-05-13 12:10:03 UTC
(rev 36665)
+++ branches/cycles/intern/cycles/kernel/svm/svm.h 2011-05-13 12:11:08 UTC
(rev 3)
@@ -167,7 +167,7 @@
else return;
}
else if(node.x == NODE_CLOSURE_BSDF)
- svm_node_closure_bsdf(sd, node.y, node.z, node.w,
randb);
+ svm_node_closure_bsdf(sd, stack, node, randb);
else if(node.x == NODE_CLOSURE_EMISSION)
svm_node_closure_emission(sd);
else if(node.x == NODE_CLOSURE_BACKGROUND)
Modified: branches/cycles/intern/cycles/kernel/svm/svm_closure.h
===
--- branches/cycles/intern/cycles/kernel/svm/svm_closure.h 2011-05-13
12:10:03 UTC (rev 36665)
+++ branches/cycles/intern/cycles/kernel/svm/svm_closure.h 2011-05-13
12:11:08 UTC (rev 3)
@@ -20,11 +20,14 @@
/* Closure Nodes */
-__device void svm_node_closure_bsdf(ShaderData *sd, uint type, int iparam1,
int iparam2, float randb)
+__device void svm_node_closure_bsdf(ShaderData *sd, float *stack, uint4 node,
float randb)
{
- float param1 = __int_as_float(iparam1);
- float param2 = __int_as_float(iparam2);
+ uint type, param1_offset, param2_offset;
+ decode_node_uchar4(node.y, type, param1_offset, param2_offset, NULL);
+ float param1 = (stack_valid(param1_offset))? stack_load_float(stack,
param1_offset): __int_as_float(node.z);
+ float param2 = (stack_valid(param2_offset))? stack_load_float(stack,
param2_offset): __int_as_float(node.w);
+
switch(type) {
case CLOSURE_BSDF_DIFFUSE_ID:
bsdf_diffuse_setup(sd, sd-N);
Modified: branches/cycles/intern/cycles/render/nodes.cpp
===
--- branches/cycles/intern/cycles/render/nodes.cpp 2011-05-13 12:10:03 UTC
(rev 36665)
+++ branches/cycles/intern/cycles/render/nodes.cpp 2011-05-13 12:11:08 UTC
(rev 3)
@@ -987,9 +987,16 @@
}
else
compiler.add_node(NODE_CLOSURE_SET_WEIGHT, color_in-value);
+
+ if(param1)
+ compiler.stack_assign(param1);
+ if(param2)
+ compiler.stack_assign(param2);
compiler.add_node(NODE_CLOSURE_BSDF,
- closure,
+ compiler.encode_uchar4(closure,
+ (param1)? param1-stack_offset: SVM_STACK_INVALID,
+ (param2)? param2-stack_offset: SVM_STACK_INVALID),
__float_as_int((param1)? param1-value.x: 0.0f),
__float_as_int((param2)? param2-value.x: 0.0f));
}
___
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 [36667] trunk/blender/build_files/buildbot /config: Use jemalloc in buildbot for linux targets
Revision: 36667
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36667
Author: nazgul
Date: 2011-05-13 12:57:54 + (Fri, 13 May 2011)
Log Message:
---
Use jemalloc in buildbot for linux targets
Modified Paths:
--
trunk/blender/build_files/buildbot/config/user-config-i686.py
trunk/blender/build_files/buildbot/config/user-config-player-i686.py
trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
trunk/blender/build_files/buildbot/config/user-config-x86_64.py
Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-13 12:11:08 UTC (rev 3)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-13 12:57:54 UTC (rev 36667)
@@ -74,6 +74,12 @@
# Blender player (would be enabled in it's own config)
WITH_BF_PLAYER = False
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-player-i686.py
2011-05-13 12:11:08 UTC (rev 3)
+++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py
2011-05-13 12:57:54 UTC (rev 36667)
@@ -59,6 +59,12 @@
WITH_BF_NOBLENDER = True
WITH_BF_PLAYER = True
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
2011-05-13 12:11:08 UTC (rev 3)
+++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py
2011-05-13 12:57:54 UTC (rev 36667)
@@ -59,6 +59,12 @@
WITH_BF_NOBLENDER = True
WITH_BF_PLAYER = True
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-13 12:11:08 UTC (rev 3)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-13 12:57:54 UTC (rev 36667)
@@ -74,6 +74,12 @@
# Blender player (would be enabled in it's own config)
WITH_BF_PLAYER = False
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
___
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 [36669] trunk/blender/source/blender: support for reading/writing image resolution (dpi), for PNG and TIFF,
Revision: 36669
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36669
Author: campbellbarton
Date: 2011-05-13 14:27:12 + (Fri, 13 May 2011)
Log Message:
---
support for reading/writing image resolution (dpi), for PNG and TIFF,
only RNA access currently 'image.resolution'.
Modified Paths:
--
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
===
--- trunk/blender/source/blender/imbuf/IMB_imbuf_types.h2011-05-13
13:17:30 UTC (rev 36668)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf_types.h2011-05-13
14:27:12 UTC (rev 36669)
@@ -93,6 +93,9 @@
char profile_filename[256]; /* to be implemented properly, specific
filename for custom profiles */
#endif
+ /* resolution - pixels per meter */
+ double ppm[2];
+
/* tiled pixel storage */
int tilex, tiley;
int xtiles, ytiles;
Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c 2011-05-13
13:17:30 UTC (rev 36668)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c 2011-05-13
14:27:12 UTC (rev 36669)
@@ -348,6 +348,7 @@
ibuf-depth= d;
ibuf-ftype= TGA;
ibuf-channels= 4; /* float option, is set to other values
when buffers get assigned */
+ ibuf-ppm[0]= ibuf-ppm[1]= 150.0 / 0.0254; /* 150dpi -
pixels-per-meter */
if(flags IB_rect) {
if(imb_addrectImBuf(ibuf)==FALSE) {
Modified: trunk/blender/source/blender/imbuf/intern/png.c
===
--- trunk/blender/source/blender/imbuf/intern/png.c 2011-05-13 13:17:30 UTC
(rev 36668)
+++ trunk/blender/source/blender/imbuf/intern/png.c 2011-05-13 14:27:12 UTC
(rev 36669)
@@ -257,6 +257,10 @@
}
+ if(ibuf-ppm[0] 0.0 ibuf-ppm[1] 0.0) {
+ png_set_pHYs(png_ptr, info_ptr, (unsigned int)(ibuf-ppm[0] +
0.5), (unsigned int)(ibuf-ppm[1] + 0.5), PNG_RESOLUTION_METER);
+ }
+
// write the file header information
png_write_info(png_ptr, info_ptr);
@@ -384,7 +388,19 @@
if (ibuf) {
ibuf-ftype = PNG;
ibuf-profile = IB_PROFILE_SRGB;
- } else {
+
+ if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
+ int unit_type;
+ unsigned int xres, yres;
+
+ if(png_get_pHYs(png_ptr, info_ptr, xres, yres,
unit_type))
+ if(unit_type == PNG_RESOLUTION_METER) {
+ ibuf-ppm[0]= xres;
+ ibuf-ppm[1]= yres;
+ }
+ }
+ }
+ else {
printf(Couldn't allocate memory for PNG image\n);
}
Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===
--- trunk/blender/source/blender/imbuf/intern/tiff.c2011-05-13 13:17:30 UTC
(rev 36668)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c2011-05-13 14:27:12 UTC
(rev 36669)
@@ -354,7 +354,26 @@
rectf[i*4 + chan] = fbuf[i];
}
+static void imb_read_tiff_resolution(ImBuf *ibuf, TIFF *image)
+{
+ uint16 unit;
+ float xres;
+ float yres;
+ TIFFGetFieldDefaulted(image, TIFFTAG_RESOLUTIONUNIT, unit);
+ TIFFGetFieldDefaulted(image, TIFFTAG_XRESOLUTION, xres);
+ TIFFGetFieldDefaulted(image, TIFFTAG_YRESOLUTION, yres);
+
+ if(unit == RESUNIT_CENTIMETER) {
+ ibuf-ppm[0]= (double)xres * 100.0;
+ ibuf-ppm[1]= (double)yres * 100.0;
+ }
+ else {
+ ibuf-ppm[0]= (double)xres / 0.0254;
+ ibuf-ppm[1]= (double)yres / 0.0254;
+ }
+}
+
/*
* Use the libTIFF scanline API to read a TIFF image.
* This method is most flexible and can handle multiple different bit depths
@@ -369,10 +388,13 @@
int ib_flag=0, row, chan;
float *fbuf=NULL;
unsigned short *sbuf=NULL;
-
+
TIFFGetField(image, TIFFTAG_BITSPERSAMPLE, bitspersample);
TIFFGetField(image, TIFFTAG_SAMPLESPERPIXEL, spp); /*
number of 'channels' */
TIFFGetField(image, TIFFTAG_PLANARCONFIG, config);
+
+ imb_read_tiff_resolution(ibuf, image);
+
scanline = TIFFScanlineSize(image);
if (bitspersample == 32) {
@@ -658,6
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36670] branches/cycles/source/blender/ editors: Cycles: action zone drawing tweak.
Revision: 36670
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36670
Author: blendix
Date: 2011-05-13 14:29:07 + (Fri, 13 May 2011)
Log Message:
---
Cycles: action zone drawing tweak.
Modified Paths:
--
branches/cycles/source/blender/editors/interface/interface_panel.c
branches/cycles/source/blender/editors/screen/area.c
Modified: branches/cycles/source/blender/editors/interface/interface_panel.c
===
--- branches/cycles/source/blender/editors/interface/interface_panel.c
2011-05-13 14:27:12 UTC (rev 36669)
+++ branches/cycles/source/blender/editors/interface/interface_panel.c
2011-05-13 14:29:07 UTC (rev 36670)
@@ -509,7 +509,7 @@
if(!(panel-flag PNL_CLOSEDX)) {
ui_draw_aligned_panel_header(style, block, headrect, 'h');
- /* itemrect smaller */
+ /* itemrect smaller */
itemrect.xmax= headrect.xmax - 5.0f/block-aspect;
itemrect.xmin= itemrect.xmax - (headrect.ymax-headrect.ymin);
itemrect.ymin= headrect.ymin;
Modified: branches/cycles/source/blender/editors/screen/area.c
===
--- branches/cycles/source/blender/editors/screen/area.c2011-05-13
14:27:12 UTC (rev 36669)
+++ branches/cycles/source/blender/editors/screen/area.c2011-05-13
14:29:07 UTC (rev 36670)
@@ -69,39 +69,6 @@
/* general area and region code */
-static void region_draw_emboss(ARegion *ar, rcti *scirct)
-{
- rcti rect;
-
- /* translate scissor rect to region space */
- rect.xmin= scirct-xmin - ar-winrct.xmin;
- rect.ymin= scirct-ymin - ar-winrct.ymin;
- rect.xmax= scirct-xmax - ar-winrct.xmin;
- rect.ymax= scirct-ymax - ar-winrct.ymin;
-
- /* set transp line */
- glEnable( GL_BLEND );
- glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-
- /* right */
- glColor4ub(0,0,0, 50);
- sdrawline(rect.xmax, rect.ymin, rect.xmax, rect.ymax);
-
- /* bottom */
- glColor4ub(0,0,0, 80);
- sdrawline(rect.xmin, rect.ymin, rect.xmax, rect.ymin);
-
- /* top */
- glColor4ub(255,255,255, 60);
- sdrawline(rect.xmin, rect.ymax, rect.xmax, rect.ymax);
-
- /* left */
- glColor4ub(255,255,255, 50);
- sdrawline(rect.xmin, rect.ymin, rect.xmin, rect.ymax);
-
- glDisable( GL_BLEND );
-}
-
void ED_region_pixelspace(ARegion *ar)
{
int width= ar-winrct.xmax-ar-winrct.xmin+1;
@@ -152,7 +119,6 @@
/* only exported for WM */
void ED_area_overdraw_flush(ScrArea *sa, ARegion *ar)
{
-#if 0
AZone *az;
for(az= sa-actionzones.first; az; az= az-next) {
@@ -166,30 +132,21 @@
az-do_draw= 1;
}
}
-#endif
}
static void area_draw_azone(short x1, short y1, short x2, short y2)
{
- int dx= floor(0.3f*(x2-x1));
- int dy= floor(0.3f*(y2-y1));
-
- glColor4ub(255, 255, 255, 180);
- fdrawline(x1, y2, x2, y1);
- glColor4ub(255, 255, 255, 130);
- fdrawline(x1, y2-dy, x2-dx, y1);
- glColor4ub(255, 255, 255, 80);
- fdrawline(x1, y2-2*dy, x2-2*dx, y1);
-
- glColor4ub(0, 0, 0, 210);
- fdrawline(x1, y2+1, x2+1, y1);
- glColor4ub(0, 0, 0, 180);
- fdrawline(x1, y2-dy+1, x2-dx+1, y1);
- glColor4ub(0, 0, 0, 150);
- fdrawline(x1, y2-2*dy+1, x2-2*dx+1, y1);
+ int dx= floor(0.9f*(x2-x1));
+ int dy= floor(0.9f*(y2-y1));
+
+ glColor4f(0.0f, 0.0f, 0.0f, 0.25f);
+ glBegin(GL_TRIANGLES);
+ glVertex2f(x1, y1);
+ glVertex2f(x1+dx, y1);
+ glVertex2f(x1, y1+dy);
+ glEnd();
}
-
static void region_draw_azone(AZone *az)
{
GLUquadricObj *qobj = NULL;
@@ -233,7 +190,6 @@
/* only exported for WM */
void ED_area_overdraw(bContext *C)
{
-#if 0
wmWindow *win= CTX_wm_window(C);
bScreen *screen= CTX_wm_screen(C);
ScrArea *sa;
@@ -259,7 +215,7 @@
}
}
glDisable( GL_BLEND );
-#endif
+
}
/* get scissor rect, checking overlapping regions */
___
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 [36673] branches/bmesh/blender: svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36673
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36673
Author: campbellbarton
Date: 2011-05-13 16:55:07 + (Fri, 13 May 2011)
Log Message:
---
svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36651
Modified Paths:
--
branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
branches/bmesh/blender/build_files/scons/config/linux2-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/blenlib/BLI_scanfill.h
branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
branches/bmesh/blender/source/blender/imbuf/SConscript
branches/bmesh/blender/source/blender/imbuf/intern/allocimbuf.c
branches/bmesh/blender/source/blender/imbuf/intern/png.c
branches/bmesh/blender/source/blender/imbuf/intern/tiff.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
Property Changed:
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___
Modified: svn:mergeinfo
- /trunk/blender:31524-36651
+ /trunk/blender:31524-36672
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
2011-05-13 16:04:20 UTC (rev 36672)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
2011-05-13 16:55:07 UTC (rev 36673)
@@ -74,6 +74,12 @@
# Blender player (would be enabled in it's own config)
WITH_BF_PLAYER = False
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified:
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===
---
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
2011-05-13 16:04:20 UTC (rev 36672)
+++
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
2011-05-13 16:55:07 UTC (rev 36673)
@@ -59,6 +59,12 @@
WITH_BF_NOBLENDER = True
WITH_BF_PLAYER = True
+# Use jemalloc memory
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36674] branches/bmesh/blender/source/ blender/bmesh/operators/mesh_conv.c: print in last commit.
Revision: 36674 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36674 Author: campbellbarton Date: 2011-05-13 16:57:50 + (Fri, 13 May 2011) Log Message: --- print in last commit. Modified Paths: -- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c === --- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-05-13 16:55:07 UTC (rev 36673) +++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-05-13 16:57:50 UTC (rev 36674) @@ -458,7 +458,6 @@ BLI_addfilledge(lasteve, firsteve); totface += BLI_edgefill(0); - printf(FAces now %d\n, totface); BLI_end_edgefill(); } ___ 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 [36675] trunk/blender/source/blender/ editors: rename setcameratoview3d to view3d_to_ob add to ED_view3d. h so others can use.
Revision: 36675
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36675
Author: campbellbarton
Date: 2011-05-13 18:05:30 + (Fri, 13 May 2011)
Log Message:
---
rename setcameratoview3d to view3d_to_ob add to ED_view3d.h so others can use.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===
--- trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-13
16:57:50 UTC (rev 36674)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-13
18:05:30 UTC (rev 36675)
@@ -188,8 +188,12 @@
/* assigning view matrix */
void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist);
+
void view3d_apply_ob(struct Object *ob, float *ofs, float *quat, float *dist,
float *lens);
+void view3d_to_ob(struct RegionView3D *rv3d, struct Object *ob);
+
int view3d_is_ortho(struct View3D *v3d, struct RegionView3D *rv3d);
+
#endif /* ED_VIEW3D_H */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-13 16:57:50 UTC (rev 36674)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-13 18:05:30 UTC (rev 36675)
@@ -396,7 +396,7 @@
/* ** change view operators ** */
-static void setcameratoview3d(RegionView3D *rv3d, Object *ob)
+void view3d_to_ob(RegionView3D *rv3d, Object *ob)
{
float dvec[3];
float mat3[3][3];
@@ -426,7 +426,7 @@
rv3d-lpersp= rv3d-persp;
}
- setcameratoview3d(rv3d, v3d-camera);
+ view3d_to_ob(rv3d, v3d-camera);
DAG_id_tag_update(v3d-camera-id, OB_RECALC_OB);
rv3d-persp = RV3D_CAMOB;
___
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 [36676] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: using the viewmatrix to position the camera could be problematic if the view
Revision: 36676
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36676
Author: campbellbarton
Date: 2011-05-13 18:32:27 + (Fri, 13 May 2011)
Log Message:
---
using the viewmatrix to position the camera could be problematic if the view
wasn't yet recalculated, use the quaternion instead.
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-13 18:05:30 UTC (rev 36675)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-13 18:32:27 UTC (rev 36676)
@@ -398,10 +398,14 @@
void view3d_to_ob(RegionView3D *rv3d, Object *ob)
{
- float dvec[3];
float mat3[3][3];
+ float iviewquat[4];
+ float dvec[3]= {0.0f, 0.0f, rv3d-dist};
- mul_v3_v3fl(dvec, rv3d-viewinv[2], rv3d-dist);
+ invert_qt_qt(iviewquat, rv3d-viewquat);
+ normalize_qt(iviewquat);
+ mul_qt_v3(iviewquat, dvec);
+
sub_v3_v3v3(ob-loc, dvec, rv3d-ofs);
rv3d-viewquat[0]= -rv3d-viewquat[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 [36677] trunk/blender/source/blender: view3d api edits, no functional changes.
Revision: 36677
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36677
Author: campbellbarton
Date: 2011-05-14 04:25:47 + (Sat, 14 May 2011)
Log Message:
---
view3d api edits, no functional changes.
rename v3d functions
* view3d_to_ob - ED_view3d_to_object
* view3d_apply_ob - ED_view3d_from_object
* view3d_apply_mat4 - ED_view3d_from_m4
Changed ED_view3d_to_object() not to temp modify the view rotation and don't
overwrite the objects recalc.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===
--- trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-13
18:32:27 UTC (rev 36676)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-14
04:25:47 UTC (rev 36677)
@@ -109,6 +109,7 @@
void viewline(struct ARegion *ar, struct View3D *v3d, float mval[2], float
ray_start[3], float ray_end[3]);
void viewray(struct ARegion *ar, struct View3D *v3d, float mval[2], float
ray_start[3], float ray_normal[3]);
+void get_object_clip_range(struct Object *ob, float *lens, float *clipsta,
float *clipend);
int get_view3d_cliprange(struct View3D *v3d, struct RegionView3D *rv3d, float
*clipsta, float *clipend);
int get_view3d_viewplane(struct View3D *v3d, struct RegionView3D *rv3d, int
winxi, int winyi, struct rctf *viewplane, float *clipsta, float *clipend, float
*pixsize);
int get_view3d_ortho(struct View3D *v3d, struct RegionView3D *rv3d);
@@ -187,10 +188,10 @@
/* assigning view matrix */
-void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist);
+void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float
*dist);
-void view3d_apply_ob(struct Object *ob, float *ofs, float *quat, float *dist,
float *lens);
-void view3d_to_ob(struct RegionView3D *rv3d, struct Object *ob);
+void ED_view3d_from_object(struct Object *ob, float ofs[3], float quat[4],
float *dist, float *lens);
+void ED_view3d_to_object(struct Object *ob, const float ofs[3], const float
quat[4], const float dist);
int view3d_is_ortho(struct View3D *v3d, struct RegionView3D *rv3d);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-13 18:32:27 UTC (rev 36676)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-14 04:25:47 UTC (rev 36677)
@@ -40,6 +40,7 @@
#include DNA_object_types.h
#include DNA_scene_types.h
#include DNA_camera_types.h
+#include DNA_lamp_types.h
#include MEM_guardedalloc.h
@@ -790,7 +791,7 @@
View3D *v3d = vod-sa-spacedata.first;
if(v3d-camera) {
- view3d_apply_ob(v3d-camera, rv3d-ofs,
rv3d-viewquat, rv3d-dist, NULL);
+ ED_view3d_from_object(v3d-camera, rv3d-ofs,
rv3d-viewquat, rv3d-dist, NULL);
}
if(rv3d-persp==RV3D_CAMOB) {
@@ -3448,3 +3449,62 @@
mul_v3_v3fl(dvec, mat[2], -rv3d-dist);
sub_v3_v3v3(mat[3], dvec, rv3d-ofs);
}
+
+
+/* Gets the view trasnformation from a camera
+* currently dosnt take camzoom into account
+*
+* The dist is not modified for this function, if NULL its assimed zero
+* */
+void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float
*dist)
+{
+ /* Offset */
+ if (ofs)
+ negate_v3_v3(ofs, mat[3]);
+
+ /* Quat */
+ if (quat) {
+ float imat[4][4];
+ invert_m4_m4(imat, mat);
+ mat4_to_quat(quat, imat);
+ }
+
+ if (dist) {
+ float nmat[3][3];
+ float vec[3];
+
+ vec[0]= 0.0f;
+ vec[1]= 0.0f;
+ vec[2]= -(*dist);
+
+ copy_m3_m4(nmat, mat);
+ normalize_m3(nmat);
+
+ mul_m3_v3(nmat, vec);;
+ sub_v3_v3(ofs, vec);
+ }
+}
+
+
+/* object - view */
+void ED_view3d_from_object(Object *ob, float ofs[3], float quat[4], float
*dist, float *lens)
+{
+ ED_view3d_from_m4(ob-obmat, ofs, quat, dist);
+
+ if (lens) {
+ get_object_clip_range(ob, lens, NULL, NULL);
+ }
+}
+
+/* view - object */
+void ED_view3d_to_object(Object *ob, const float ofs[3], const float quat[4],
const float dist)
+{
+ float mat4[4][4];
+ float dvec[3]= {0.0f, 0.0f, dist};
+ float iviewquat[4]= {-quat[0], quat[1], quat[2], quat[3]};
+
+ quat_to_mat4(mat4, iviewquat);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36678] branches/soc-2010-moguri/: Deleting my old 2010 shader branch so I can recreate it
Revision: 36678 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36678 Author: moguri Date: 2011-05-14 04:39:27 + (Sat, 14 May 2011) Log Message: --- Deleting my old 2010 shader branch so I can recreate it Removed Paths: - branches/soc-2010-moguri/ ___ 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 [36680] trunk/blender/source/blender: minor changes to view3d operators, add View3D to 'ViewOpsData'
Revision: 36680
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36680
Author: campbellbarton
Date: 2011-05-14 05:42:58 + (Sat, 14 May 2011)
Log Message:
---
minor changes to view3d operators, add View3D to 'ViewOpsData'
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-14
04:59:37 UTC (rev 36679)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-14
05:42:58 UTC (rev 36680)
@@ -1670,21 +1670,20 @@
{
float rmat[3][3], dmat[3][3];
- /* initialise the delta-rotation matrix, which will get (pre)multiplied
+ /* 'dmat' is the delta-rotation matrix, which will get (pre)multiplied
* with the rotation matrix to yield the appropriate rotation
*/
- unit_m3(dmat);
-
+
/* rotations may either be quats, eulers (with various rotation
orders), or axis-angle */
if (ob-rotmode 0) {
/* euler rotations (will cause gimble lock, but this can be
alleviated a bit with rotation orders) */
- eulO_to_mat3( rmat,ob-rot, ob-rotmode);
- eulO_to_mat3( dmat,ob-drot, ob-rotmode);
+ eulO_to_mat3(rmat, ob-rot, ob-rotmode);
+ eulO_to_mat3(dmat, ob-drot, ob-rotmode);
}
else if (ob-rotmode == ROT_MODE_AXISANGLE) {
/* axis-angle - not really that great for 3D-changing
orientations */
- axis_angle_to_mat3( rmat,ob-rotAxis, ob-rotAngle);
- axis_angle_to_mat3( dmat,ob-drotAxis, ob-drotAngle);
+ axis_angle_to_mat3(rmat, ob-rotAxis, ob-rotAngle);
+ axis_angle_to_mat3(dmat, ob-drotAxis, ob-drotAngle);
}
else {
/* quats are normalised before use to eliminate scaling issues
*/
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-14 04:59:37 UTC (rev 36679)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-14 05:42:58 UTC (rev 36680)
@@ -278,6 +278,7 @@
typedef struct ViewOpsData {
ScrArea *sa;
ARegion *ar;
+ View3D *v3d;
RegionView3D *rv3d;
/* needed for continuous zoom */
@@ -332,7 +333,6 @@
static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event)
{
static float lastofs[3] = {0,0,0};
- View3D *v3d;
RegionView3D *rv3d;
ViewOpsData *vod= MEM_callocN(sizeof(ViewOpsData), viewops data);
@@ -340,7 +340,7 @@
op-customdata= vod;
vod-sa= CTX_wm_area(C);
vod-ar= CTX_wm_region(C);
- v3d= vod-sa-spacedata.first;
+ vod-v3d= vod-sa-spacedata.first;
vod-rv3d= rv3d= vod-ar-regiondata;
vod-dist0= rv3d-dist;
copy_qt_qt(vod-oldquat, rv3d-viewquat);
@@ -359,7 +359,7 @@
view3d_operator_needs_opengl(C); /* needed for zbuf drawing */
- if((vod-use_dyn_ofs=view_autodist(CTX_data_scene(C), vod-ar,
v3d, event-mval, vod-dyn_ofs))) {
+ if((vod-use_dyn_ofs=view_autodist(CTX_data_scene(C), vod-ar,
vod-v3d, event-mval, vod-dyn_ofs))) {
if (rv3d-persp==RV3D_PERSP) {
float my_origin[3]; /* original G.vd-ofs */
float my_pivot[3]; /* view */
@@ -400,8 +400,8 @@
window_to_3d_vector(vod-ar, vod-mousevec, vod-oldx -
vod-ar-winrct.xmin, vod-oldy - vod-ar-winrct.ymin);
/* lookup, we dont pass on v3d to prevent confusement */
- vod-grid= v3d-grid;
- vod-far= v3d-far;
+ vod-grid= vod-v3d-grid;
+ vod-far= vod-v3d-far;
calctrackballvec(vod-ar-winrct, event-x, event-y, vod-trackvec);
@@ -788,10 +788,8 @@
else if(rv3d-persp==RV3D_CAMOB) {
/* changed since 2.4x, use the camera view */
- View3D *v3d = vod-sa-spacedata.first;
-
- if(v3d-camera) {
- ED_view3d_from_object(v3d-camera, rv3d-ofs,
rv3d-viewquat, rv3d-dist, NULL);
+ if(vod-v3d-camera) {
+ ED_view3d_from_object(vod-v3d-camera,
rv3d-ofs, rv3d-viewquat, rv3d-dist, NULL);
}
if(rv3d-persp==RV3D_CAMOB) {
@@ -1270,6 +1268,12 @@
/* viewdolly_invoke() copied this function, changes here may apply there */
static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
+ ViewOpsData *vod;
+
+ /* makes
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36681] branches/particles-2010/source/ blender: Accidentally commited a small patch with socker viewer output buttons.
Revision: 36681
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36681
Author: lukastoenne
Date: 2011-05-14 05:55:18 + (Sat, 14 May 2011)
Log Message:
---
Accidentally commited a small patch with socker viewer output buttons.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-14 05:42:58 UTC (rev 36680)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-14 05:55:18 UTC (rev 36681)
@@ -295,7 +295,6 @@
* new tree types have a per-output socket flag to indicate the final output
to use explicitly.
*/
void ntreeSetOutput(struct bNodeTree *ntree);
-void ntreeSetViewerOutput(struct bNodeTree *ntree, struct
bNodeSocket *output);
void ntreeInitPreview(struct bNodeTree *, int xsize, int
ysize);
void ntreeClearPreview(struct bNodeTree *ntree);
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-14 05:42:58 UTC (rev 36680)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-14 05:55:18 UTC (rev 36681)
@@ -990,21 +990,6 @@
might be different for editor or for real use... */
}
-void ntreeSetViewerOutput(bNodeTree *ntree, bNodeSocket *output)
-{
- bNode *node;
- bNodeSocket *sock;
-
- for (node=ntree-nodes.first; node; node=node-next) {
- for (sock=node-outputs.first; sock; sock=sock-next) {
- if (sock == output)
- sock-flag |= SOCK_VIEW_OUTPUT;
- else
- sock-flag = ~SOCK_VIEW_OUTPUT;
- }
- }
-}
-
typedef struct MakeLocalCallData {
ID *group_id;
ID *new_id;
Modified: branches/particles-2010/source/blender/editors/space_node/node_draw.c
===
--- branches/particles-2010/source/blender/editors/space_node/node_draw.c
2011-05-14 05:42:58 UTC (rev 36680)
+++ branches/particles-2010/source/blender/editors/space_node/node_draw.c
2011-05-14 05:55:18 UTC (rev 36681)
@@ -704,12 +704,6 @@
node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE);
- /* button for viewer output flag */
- if (sock-flag SOCK_VIEW_OUTPUT)
- uiDefIconButR(node-block, TOG, 0,
ICON_RESTRICT_VIEW_OFF, sock-locx-22, sock-locy-8, 16, 16, sockptr, view,
0, 0, 0, 0, 0, );
- else
- uiDefIconButR(node-block, TOG, 0,
ICON_RESTRICT_VIEW_ON, sock-locx-22, sock-locy-8, 16, 16, sockptr, view,
0, 0, 0, 0, 0, );
-
ofs= 0;
UI_ThemeColor(TH_TEXT);
slen= snode-aspect*UI_GetStringWidth(sock-name);
@@ -717,7 +711,7 @@
ofs++;
slen= snode-aspect*UI_GetStringWidth(sock-name+ofs);
}
- uiDefBut(node-block, LABEL, 0, sock-name+ofs,
(short)(sock-locx-35.0f-slen), (short)(sock-locy-9.0f),
+ uiDefBut(node-block, LABEL, 0, sock-name+ofs,
(short)(sock-locx-15.0f-slen), (short)(sock-locy-9.0f),
(short)(node-width-NODE_DY), NODE_DY, NULL,
0, 0, 0, 0, );
}
Modified: branches/particles-2010/source/blender/editors/space_node/node_edit.c
===
--- branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-14 05:42:58 UTC (rev 36680)
+++ branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-14 05:55:18 UTC (rev 36681)
@@ -2162,14 +2162,6 @@
node-flag = ~(NODE_SELECT|NODE_ACTIVE);
newnode-flag |= NODE_SELECT;
- /* make sure only one is final output */
- for (sock=newnode-outputs.first; sock;
sock=sock-next) {
- if (sock-flag SOCK_VIEW_OUTPUT) {
- ntreeSetViewerOutput(ntree, sock);
-
