[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42373] branches/bmesh/blender: svn merge ^/trunk/blender -r42361:42372
Campbell Barton
ideasman42 at gmail.com
Sat Dec 3 22:01:31 CET 2011
Revision: 42373
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42373
Author: campbellbarton
Date: 2011-12-03 21:01:26 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42361:42372
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42361
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp
branches/bmesh/blender/intern/cycles/util/util_boundbox.h
branches/bmesh/blender/intern/cycles/util/util_math.h
branches/bmesh/blender/source/blender/blenkernel/intern/paint.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/transform/transform_input.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42361
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42372
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/CMakeLists.txt 2011-12-03 21:01:26 UTC (rev 42373)
@@ -857,14 +857,23 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ if(MSVC10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ else()
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ endif()
set(BOOST_LIBRARIES
- optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
- libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
- debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
- libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
- set(BOOST_LIBPATH ${BOOST}/lib)
+ optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
+ optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(MSVC10)
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ else()
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
Modified: branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp 2011-12-03 21:01:26 UTC (rev 42373)
@@ -59,16 +59,18 @@
Mesh::Triangle t = mesh->triangles[j];
Reference ref;
- ref.prim_index = j;
- ref.prim_object = i;
-
for(int k = 0; k < 3; k++) {
float3 pt = mesh->verts[t.v[k]];
ref.bounds.grow(pt);
}
- references.push_back(ref);
- root.bounds.grow(ref.bounds);
+ if(ref.bounds.valid()) {
+ ref.prim_index = j;
+ ref.prim_object = i;
+
+ references.push_back(ref);
+ root.bounds.grow(ref.bounds);
+ }
}
}
Modified: branches/bmesh/blender/intern/cycles/util/util_boundbox.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_boundbox.h 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/intern/cycles/util/util_boundbox.h 2011-12-03 21:01:26 UTC (rev 42373)
@@ -21,6 +21,7 @@
#include <float.h>
+#include "util_math.h"
#include "util_transform.h"
#include "util_types.h"
@@ -71,7 +72,9 @@
bool valid(void) const
{
- return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z);
+ return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) &&
+ !(isnan(min.x) || isnan(min.y) || isnan(min.z)) &&
+ !(isnan(max.x) || isnan(max.y) || isnan(max.z));
}
BoundBox transformed(const Transform *tfm)
Modified: branches/bmesh/blender/intern/cycles/util/util_math.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_math.h 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/intern/cycles/util/util_math.h 2011-12-03 21:01:26 UTC (rev 42373)
@@ -63,6 +63,7 @@
#if(!defined(FREE_WINDOWS))
#define copysignf(x, y) ((float)_copysign(x, y))
#define hypotf(x, y) _hypotf(x, y)
+#define isnan(x) _isnan(x)
#endif
#endif
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42361
+ /trunk/blender/release:31524-42372
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/paint.c 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/paint.c 2011-12-03 21:01:26 UTC (rev 42373)
@@ -90,15 +90,28 @@
}
}
+/* are we in vertex paint or weight pain face select mode? */
int paint_facesel_test(Object *ob)
{
- return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)));
+ return ( (ob != NULL) &&
+ (ob->type == OB_MESH) &&
+ (ob->data != NULL) &&
+ (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) &&
+ (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
+ );
}
+/* are we in weight paint vertex select mode? */
int paint_vertsel_test(Object *ob)
{
- return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) && (ob->mode & OB_MODE_WEIGHT_PAINT));
+ return ( (ob != NULL) &&
+ (ob->type == OB_MESH) &&
+ (ob->data != NULL) &&
+ (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) &&
+ (ob->mode & OB_MODE_WEIGHT_PAINT)
+ );
}
+
void paint_init(Paint *p, const char col[3])
{
Brush *brush;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-12-03 21:01:26 UTC (rev 42373)
@@ -1650,6 +1650,7 @@
MEM_freeN(context);
}
+#ifdef WITH_LIBMV
static void solve_reconstruction_update_cb(void *customdata, double progress, const char *message)
{
ReconstructProgressData *progressdata= customdata;
@@ -1662,6 +1663,7 @@
BLI_snprintf(progressdata->stats_message, progressdata->message_size,
"Solving camera | %s", message);
}
+#endif
#if 0
static int solve_reconstruction_testbreak_cb(void *customdata)
Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42361
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42372
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c 2011-12-03 20:49:41 UTC (rev 42372)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c 2011-12-03 21:01:26 UTC (rev 42373)
@@ -692,7 +692,8 @@
const float size= ED_view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f;
float verts[CIRCLE_RESOL][3];
- /* using gldepthfunc guarantees that it does write z values, but not checks for it, so centers remain visible independt order of drawing */
+ /* using gldepthfunc guarantees that it does write z values,
+ * but not checks for it, so centers remain visible independt order of drawing */
if(v3d->zbuf) glDepthFunc(GL_ALWAYS);
glEnable(GL_BLEND);
@@ -753,10 +754,14 @@
CachedTextLevel++;
}
-void view3d_cached_text_draw_add(const float co[3], const char *str, short xoffs, short flag, const unsigned char col[4])
+void view3d_cached_text_draw_add(const float co[3],
+ const char *str,
+ short xoffs, short flag,
+ const unsigned char col[4])
{
int alloc_len= strlen(str) + 1;
ListBase *strings= &CachedText[CachedTextLevel-1];
+ /* TODO, replace with more efficient malloc, perhaps memarena per draw? */
ViewCachedString *vos= MEM_callocN(sizeof(ViewCachedString) + alloc_len, "ViewCachedString");
BLI_addtail(strings, vos);
@@ -818,7 +823,9 @@
else glDepthMask(0);
for(vos= strings->first; vos; vos= vos->next) {
-#if 0 // too slow, reading opengl info while drawing is very bad, better to see if we can use the zbuffer while in pixel space - campbell
+ /* too slow, reading opengl info while drawing is very bad,
+ * better to see if we can use the zbuffer while in pixel space - campbell */
+#if 0
if(v3d->zbuf && (vos->flag & V3D_CACHE_TEXT_ZBUF)) {
gluProject(vos->vec[0], vos->vec[1], vos->vec[2], mats.modelview, mats.projection, (GLint *)mats.viewport, &ux, &uy, &uz);
glReadPixels(ar->winrct.xmin+vos->mval[0]+vos->xoffs, ar->winrct.ymin+vos->mval[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
@@ -834,12 +841,14 @@
glColor3ubv(vos->col.ub);
col_pack_prev= vos->col.pack;
}
- if(vos->flag & V3D_CACHE_TEXT_ASCII) {
- BLF_draw_default_ascii((float)vos->sco[0]+vos->xoffs, (float)vos->sco[1], (depth_write)? 0.0f: 2.0f, str, vos->str_len);
- }
- else {
- BLF_draw_default((float)vos->sco[0]+vos->xoffs, (float)vos->sco[1], (depth_write)? 0.0f: 2.0f, str, vos->str_len);
- }
+ ((vos->flag & V3D_CACHE_TEXT_ASCII) ?
+ BLF_draw_default_ascii :
+ BLF_draw_default
+ ) ( (float)vos->sco[0] + vos->xoffs,
+ (float)vos->sco[1],
+ (depth_write) ? 0.0f: 2.0f,
+ str,
+ vos->str_len);
}
}
@@ -894,8 +903,12 @@
static void drawcube_size(float size)
{
glBegin(GL_LINE_STRIP);
- glVertex3f(-size,-size,-size); glVertex3f(-size,-size,size);glVertex3f(-size,size,size); glVertex3f(-size,size,-size);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list