[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38000] branches/soc-2011-onion: merge with trunk r37998
Antony Riakiotakis
kalast at gmail.com
Fri Jul 1 08:03:12 CEST 2011
Revision: 38000
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38000
Author: psy-fi
Date: 2011-07-01 06:03:12 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
merge with trunk r37998
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37998
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion/source/blender/blenkernel/intern/key.c
branches/soc-2011-onion/source/blender/editors/armature/armature_ops.c
branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion/source/blender/editors/object/object_edit.c
branches/soc-2011-onion/source/blender/editors/object/object_hook.c
branches/soc-2011-onion/source/blender/editors/screen/area.c
branches/soc-2011-onion/source/blender/editors/screen/screen_edit.c
branches/soc-2011-onion/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-onion/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion/source/blender/render/intern/source/convertblender.c
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37961
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37998
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-07-01 06:03:12 UTC (rev 38000)
@@ -715,7 +715,7 @@
set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
endif()
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib\;msvcmrt.lib\;msvcurt.lib\;msvcrtd.lib ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
@@ -724,7 +724,7 @@
set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
endif()
- set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib\;libc.lib")
+ set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
else()
# keep GCC spesific stuff here
Modified: branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py 2011-07-01 06:03:12 UTC (rev 38000)
@@ -184,7 +184,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib;msvcmrt.lib;msvcurt.lib;msvcrtd.lib']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py 2011-07-01 06:03:12 UTC (rev 38000)
@@ -193,7 +193,7 @@
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib;msvcmrt.lib;msvcurt.lib;msvcrtd.lib']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
Modified: branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-01 06:03:12 UTC (rev 38000)
@@ -287,7 +287,7 @@
else:
return v1[1], v2[1]
- if not PREF_FIX_LOOPS:
+ if not fix_loops:
'''
Normal single concave loop filling
'''
Modified: branches/soc-2011-onion/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_operators/image.py 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/release/scripts/startup/bl_operators/image.py 2011-07-01 06:03:12 UTC (rev 38000)
@@ -60,7 +60,7 @@
filepath = bpy.path.abspath(self.filepath)
if not os.path.exists(filepath):
- self.report({'ERROR'}, "Image path %r not found." % filepath)
+ self.report({'ERROR'}, "Image path %r not found, image may be packed or unsaved." % filepath)
return {'CANCELLED'}
cmd = self._editor_guess(context) + [filepath]
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/key.c 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/key.c 2011-07-01 06:03:12 UTC (rev 38000)
@@ -63,6 +63,7 @@
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_object.h"
+#include "BKE_deform.h"
#include "RNA_access.h"
@@ -1005,7 +1006,7 @@
MDeformVert *dvert= NULL;
EditMesh *em= NULL;
EditVert *eve;
- int totvert= 0, index= 0;
+ int totvert= 0, defgrp_index= 0;
/* no vgroup string set? */
if(vgroup[0]==0) return NULL;
@@ -1028,10 +1029,10 @@
if(dvert==NULL) return NULL;
/* find the group (weak loop-in-loop) */
- index= defgroup_name_index(ob, vgroup);
- if(index >= 0) {
+ defgrp_index= defgroup_name_index(ob, vgroup);
+ if(defgrp_index >= 0) {
float *weights;
- int i, j;
+ int i;
weights= MEM_callocN(totvert*sizeof(float), "weights");
@@ -1040,23 +1041,13 @@
dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
if(dvert) {
- for(j=0; j<dvert->totweight; j++) {
- if(dvert->dw[j].def_nr == index) {
- weights[i]= dvert->dw[j].weight;
- break;
- }
- }
+ weights[i]= defvert_find_weight(dvert, defgrp_index);
}
}
}
else {
for(i=0; i < totvert; i++, dvert++) {
- for(j=0; j<dvert->totweight; j++) {
- if(dvert->dw[j].def_nr == index) {
- weights[i]= dvert->dw[j].weight;
- break;
- }
- }
+ weights[i]= defvert_find_weight(dvert, defgrp_index);
}
}
Modified: branches/soc-2011-onion/source/blender/editors/armature/armature_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/armature/armature_ops.c 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/source/blender/editors/armature/armature_ops.c 2011-07-01 06:03:12 UTC (rev 38000)
@@ -265,7 +265,7 @@
/* set flags */
WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
- WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_disable", WKEY, KM_PRESS, KM_ALT, 0);
/* armature/bone layers */
@@ -343,7 +343,7 @@
/* set flags */
WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
- WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_disable", WKEY, KM_PRESS, KM_ALT, 0);
/* armature/bone layers */
Modified: branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c 2011-07-01 06:03:12 UTC (rev 38000)
@@ -142,13 +142,13 @@
static void round_box_shade_col(float *col1, float *col2, float fac)
{
- float col[3];
+ float col[4];
col[0]= (fac*col1[0] + (1.0f-fac)*col2[0]);
col[1]= (fac*col1[1] + (1.0f-fac)*col2[1]);
col[2]= (fac*col1[2] + (1.0f-fac)*col2[2]);
-
- glColor3fv(col);
+ col[3]= (fac*col1[3] + (1.0f-fac)*col2[3]);
+ glColor4fv(col);
}
@@ -159,7 +159,7 @@
float vec[7][2]= {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169}, {0.707, 0.293},
{0.831, 0.45}, {0.924, 0.617}, {0.98, 0.805}};
float div= maxy-miny;
- float coltop[3], coldown[3], color[4];
+ float coltop[4], coldown[4], color[4];
int a;
/* mult */
@@ -173,9 +173,11 @@
coltop[0]= color[0]+shadetop; if(coltop[0]>1.0f) coltop[0]= 1.0f;
coltop[1]= color[1]+shadetop; if(coltop[1]>1.0f) coltop[1]= 1.0f;
coltop[2]= color[2]+shadetop; if(coltop[2]>1.0f) coltop[2]= 1.0f;
+ coltop[3]= color[3];
coldown[0]= color[0]+shadedown; if(coldown[0]<0.0f) coldown[0]= 0.0f;
coldown[1]= color[1]+shadedown; if(coldown[1]<0.0f) coldown[1]= 0.0f;
coldown[2]= color[2]+shadedown; if(coldown[2]<0.0f) coldown[2]= 0.0f;
+ coldown[3]= color[3];
glShadeModel(GL_SMOOTH);
glBegin(mode);
Modified: branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c 2011-07-01 06:03:12 UTC (rev 38000)
@@ -180,7 +180,7 @@
glEnable(GL_BLEND);
glGetFloatv(GL_CURRENT_COLOR, color);
- color[3]= 0.125;
+ color[3]*= 0.125;
glColor4fv(color);
/* for each AA step */
Modified: branches/soc-2011-onion/source/blender/editors/object/object_edit.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/object/object_edit.c 2011-07-01 05:58:28 UTC (rev 37999)
+++ branches/soc-2011-onion/source/blender/editors/object/object_edit.c 2011-07-01 06:03:12 UTC (rev 38000)
@@ -1704,7 +1704,7 @@
{
/* identifiers */
ot->name= "Shade Smooth";
- ot->description= "Display faces 'smooth' (using vertext normals)";
+ ot->description= "Display faces 'smooth' (using vertex normals)";
ot->idname= "OBJECT_OT_shade_smooth";
/* api callbacks */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list