[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42745] branches/bmesh/blender: svn merge ^/trunk/blender -r42722:42742
Campbell Barton
ideasman42 at gmail.com
Tue Dec 20 02:33:18 CET 2011
Revision: 42745
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42745
Author: campbellbarton
Date: 2011-12-20 01:33:14 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42722:42742
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42722
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
branches/bmesh/blender/intern/cycles/util/util_transform.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/space_node/node_buttons.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/creator/CMakeLists.txt
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42722
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42742
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/CMakeLists.txt 2011-12-20 01:33:14 UTC (rev 42745)
@@ -723,11 +723,7 @@
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
- if(CMAKE_CL_64)
- set(PNG_LIBRARIES libpng)
- else()
- set(PNG_LIBRARIES libpng_st)
- endif()
+ set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
set(PNG "${LIBDIR}/png")
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/SConstruct 2011-12-20 01:33:14 UTC (rev 42745)
@@ -726,10 +726,6 @@
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
- #currently win64-vc doesn't appear to have libpng.dll
- if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
-
dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
Modified: branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-20 01:33:14 UTC (rev 42745)
@@ -64,7 +64,7 @@
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
WITH_BF_PNG = True
-BF_PNG = LIBDIR + 'gcc/png'
+BF_PNG = LIBDIR + '/gcc/png'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-12-20 01:33:14 UTC (rev 42745)
@@ -72,7 +72,7 @@
WITH_BF_PNG = True
BF_PNG = LIBDIR + '/png'
BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng_st'
+BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True
Modified: branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp 2011-12-20 01:33:14 UTC (rev 42745)
@@ -207,6 +207,7 @@
/* transform, note the blender camera points along the negative z-axis */
cam->matrix = bcam->matrix * transform_scale(1.0f, 1.0f, -1.0f);
+ cam->matrix = transform_clear_scale(cam->matrix);
/* set update flag */
if(cam->modified(prevcam))
Modified: branches/bmesh/blender/intern/cycles/util/util_transform.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_transform.h 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/intern/cycles/util/util_transform.h 2011-12-20 01:33:14 UTC (rev 42745)
@@ -209,6 +209,13 @@
return make_float3(t->x[column], t->y[column], t->z[column]);
}
+__device_inline void transform_set_column(Transform *t, int column, float3 value)
+{
+ t->x[column] = value.x;
+ t->y[column] = value.y;
+ t->z[column] = value.z;
+}
+
Transform transform_inverse(const Transform& a);
__device_inline bool transform_uniform_scale(const Transform& tfm, float& scale)
@@ -244,6 +251,17 @@
return (dot(cross(c0, c1), c2) < 0.0f);
}
+__device_inline Transform transform_clear_scale(const Transform& tfm)
+{
+ Transform ntfm = tfm;
+
+ transform_set_column(&ntfm, 0, normalize(transform_get_column(&ntfm, 0)));
+ transform_set_column(&ntfm, 1, normalize(transform_get_column(&ntfm, 1)));
+ transform_set_column(&ntfm, 2, normalize(transform_get_column(&ntfm, 2)));
+
+ return ntfm;
+}
+
#endif
CCL_NAMESPACE_END
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2011-12-20 01:33:14 UTC (rev 42745)
@@ -34,6 +34,7 @@
#endif
#include <OpenGL/gl.h>
+#include <OpenGL/CGLRenderers.h>
/***** Multithreaded opengl code : uncomment for enabling
#include <OpenGL/OpenGL.h>
*/
@@ -485,7 +486,14 @@
// needed for 'Draw Overlap' drawing method
pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
- pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+ // Force software OpenGL, for debugging
+ if(getenv("BLENDER_SOFTWAREGL")) {
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFARendererID;
+ pixelFormatAttrsWindow[i++] = kCGLRendererGenericID;
+ }
+ else
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
@@ -521,7 +529,14 @@
// needed for 'Draw Overlap' drawing method
pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
- pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+ // Force software OpenGL, for debugging
+ if(getenv("BLENDER_SOFTWAREGL")) {
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFARendererID;
+ pixelFormatAttrsWindow[i++] = kCGLRendererGenericID;
+ }
+ else
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42722
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42742
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py 2011-12-20 01:33:14 UTC (rev 42745)
@@ -174,9 +174,7 @@
st = context.space_data
text = st.text
- layout.operator_context = 'EXEC_AREA'
layout.operator("text.new")
- layout.operator_context = 'INVOKE_AREA'
layout.operator("text.open")
if text:
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_node.h 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_node.h 2011-12-20 01:33:14 UTC (rev 42745)
@@ -305,8 +305,6 @@
void ntreeMakeLocal(struct bNodeTree *ntree);
int ntreeHasType(struct bNodeTree *ntree, int type);
-void ntreeSocketUseFlags(struct bNodeTree *ntree);
-
void ntreeUpdateTree(struct bNodeTree *ntree);
/* XXX Currently each tree update call does call to ntreeVerifyNodes too.
* Some day this should be replaced by a decent depsgraph automatism!
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h 2011-12-20 01:33:14 UTC (rev 42745)
@@ -67,7 +67,7 @@
void init_colorband(struct ColorBand *coba, int rangetype);
struct ColorBand *add_colorband(int rangetype);
-int do_colorband(struct ColorBand *coba, float in, float out[4]);
+int do_colorband(const struct ColorBand *coba, float in, float out[4]);
void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
int vergcband(const void *a1, const void *a2);
struct CBData *colorband_element_add(struct ColorBand *coba, float position);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-12-20 00:46:55 UTC (rev 42744)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-12-20 01:33:14 UTC (rev 42745)
@@ -883,7 +883,7 @@
CALC_WP_AUTO_NORMALIZE= (1<<1)
};
-void weightpaint_color(unsigned char r_col[4], ColorBand *coba, const float input)
+static void weightpaint_color(unsigned char r_col[4], ColorBand *coba, const float input)
{
float colf[4];
@@ -910,10 +910,10 @@
if ((selected > 1) && (draw_flag & CALC_WP_MULTIPAINT)) {
int was_a_nonzero= FALSE;
- int i;
+ unsigned int i;
MDeformWeight *dw= dv->dw;
- for (i = dv->totweight; i > 0; i--, dw++) {
+ for (i = dv->totweight; i != 0; i--, dw++) {
/* in multipaint, get the average if auto normalize is inactive
* get the sum if it is active */
if (dw->def_nr < defbase_tot) {
@@ -958,70 +958,81 @@
stored_cb= coba;
}
-static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm, int const draw_flag)
+/* return an array of vertex weight colors */
+static unsigned char *calc_weightpaint_vert_array(Object *ob, int const draw_flag, ColorBand *coba)
{
Mesh *me = ob->data;
- MFace *mf = dm->getTessFaceArray(dm);
- MLoop *mloop = dm->getLoopArray(dm), *ml;
- MPoly *mp = dm->getPolyArray(dm);
- ColorBand *coba= stored_cb; /* warning, not a local var */
- unsigned char *wtcol;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list