[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43996] branches/bmesh/blender: svn merge ^/trunk/blender -r43976:43995
Campbell Barton
ideasman42 at gmail.com
Thu Feb 9 02:53:29 CET 2012
Revision: 43996
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43996
Author: campbellbarton
Date: 2012-02-09 01:53:14 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43976:43995
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43976
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.c
Added Paths:
-----------
branches/bmesh/blender/build_files/scons/config/Modules/
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872
/trunk/blender:39992-43976
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872
/trunk/blender:39992-43995
Modified: branches/bmesh/blender/build_files/scons/config/linux-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linux-config.py 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/build_files/scons/config/linux-config.py 2012-02-09 01:53:14 UTC (rev 43996)
@@ -1,6 +1,8 @@
# find library directory
import platform
import os
+from Modules.FindPython import FindPython
+
bitness = platform.architecture()[0]
if bitness == '64bit':
LCGDIR = '../lib/linux64'
@@ -8,10 +10,12 @@
LCGDIR = '../lib/linux'
LIBDIR = "#${LCGDIR}"
-BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros
-BF_PYTHON = '/usr'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
+py = FindPython()
+
+BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
+BF_PYTHON = py['PYTHON']
+BF_PYTHON_LIBPATH = py['LIBPATH']
+BF_PYTHON_VERSION = py['VERSION']
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2012-02-09 01:53:14 UTC (rev 43996)
@@ -437,8 +437,9 @@
static_ob, shared_ob = SCons.Tool.createObjBuilders(env)
static_ob.add_action('.c', mycaction)
static_ob.add_action('.cpp', mycppaction)
+ static_ob.add_action('.cc', mycppaction)
shared_ob.add_action('.c', myshcaction)
- shared_ob.add_action('.cpp', myshcppaction)
+ shared_ob.add_action('.cc', myshcppaction)
static_lib = SCons.Builder.Builder(action = mylibaction,
emitter = '$LIBEMITTER',
@@ -648,8 +649,11 @@
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+ lib = env['BF_PYTHON_LIBPATH'].split(os.sep)[-1]
+ target_lib = "lib64" if lib == "lib64" else "lib"
+
py_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] )
- py_target = env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] )
+ py_target = env.subst( dir + '/python/' + target_lib + '/python'+env['BF_PYTHON_VERSION'] )
# This is a bit weak, but dont install if its been installed before, makes rebuilds quite slow.
if os.path.exists(py_target):
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h 2012-02-09 01:53:14 UTC (rev 43996)
@@ -27,29 +27,13 @@
float brightness = stack_load_float(stack, bright_offset);
float contrast = stack_load_float(stack, contrast_offset);
- brightness *= 1.0f/100.0f;
- float delta = contrast * (1.0f/200.0f);
- float a = 1.0f - delta * 2.0f;
- float b;
+ float a = 1.0f + contrast;
+ float b = brightness - contrast*0.5f;
- /*
- * The algorithm is by Werner D. Streidt
- * (http://visca.com/ffactory/archives/5-99/msg00021.html)
- * Extracted of OpenCV demhist.c
- */
- if (contrast > 0.0f) {
- a = (a > 0.0f? (1.0f / a): 0.0f);
- b = a * (brightness - delta);
- }
- else {
- delta *= -1.0f;
- b = a * (brightness + delta);
- }
+ color.x = max(a*color.x + b, 0.0f);
+ color.y = max(a*color.y + b, 0.0f);
+ color.z = max(a*color.z + b, 0.0f);
- color.x = a*color.x + b;
- color.y = a*color.y + b;
- color.z = a*color.z + b;
-
if (stack_valid(out_color))
stack_store_float3(stack, out_color, color);
}
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918,43935-43976
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918,43935-43995
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py 2012-02-09 01:53:14 UTC (rev 43996)
@@ -161,7 +161,7 @@
class BakeAction(Operator):
- """Bake animation to an Action"""
+ """Bake object/pose loc/scale/rotation animation to a new action"""
bl_idname = "nla.bake"
bl_label = "Bake Action"
bl_options = {'REGISTER', 'UNDO'}
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-09 01:53:14 UTC (rev 43996)
@@ -750,7 +750,11 @@
layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
+ layout.separator()
+ layout.operator("nla.bake", text="Bake Action...")
+
+
class VIEW3D_MT_object_clear(Menu):
bl_label = "Clear"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2012-02-09 01:53:14 UTC (rev 43996)
@@ -361,8 +361,23 @@
if (a)
BMO_Finish_Op(bm, &bmop);
- BMO_CallOpf(bm, "removedoubles verts=%fv dist=%f", VERT_MARK, 0.001f);
+ {
+ float len, len2, vec2[3];
+ len= 2*dia*sinf(phid / 2.0f);
+
+ /* length of one segment in shortest parallen */
+ vec[0]= dia*sinf(phid);
+ vec[1]= 0.0;
+ vec[2]= dia*cosf(phid);
+
+ mul_v3_m3v3(vec2, cmat, vec);
+ len2= len_v3v3(vec, vec2);
+
+ /* use shortest segment length divided by 3 as merge threshold */
+ BMO_CallOpf(bm, "removedoubles verts=%fv dist=%f", VERT_MARK, MIN2(len, len2) / 3.0f);
+ }
+
/* and now do imat */
BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
if (BMO_TestFlag(bm, eve, VERT_MARK)) {
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2012-02-08 20:40:44 UTC (rev 43995)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c 2012-02-09 01:53:14 UTC (rev 43996)
@@ -1711,6 +1711,18 @@
// if (EM_texFaceCheck())
}
+static void linked_limit_default(bContext *C, wmOperator *op)
+{
+ if(!RNA_struct_property_is_set(op->ptr, "limit")) {
+ Object *obedit= CTX_data_edit_object(C);
+ BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh;
+ if(em->selectmode == SCE_SELECT_FACE)
+ RNA_boolean_set(op->ptr, "limit", TRUE);
+ else
+ RNA_boolean_set(op->ptr, "limit", FALSE);
+ }
+}
+
static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
Object *obedit= CTX_data_edit_object(C);
@@ -1722,7 +1734,13 @@
BMEdge *e, *eed;
BMFace *efa;
int sel= !RNA_boolean_get(op->ptr, "deselect");
-
+
+ int limit;
+
+ linked_limit_default(C, op);
+
+ limit = RNA_boolean_get(op->ptr, "limit");
+
/* unified_finednearest needs ogl */
view3d_operator_needs_opengl(C);
@@ -1739,12 +1757,6 @@
vc.mval[1]= event->mval[1];
/* return warning! */
-
- /*if (limit) {
- int retval= select_linked_limited_invoke(&vc, 0, sel);
- WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit);
- return retval;
- }*/
if ( unified_findnearest(&vc, &eve, &eed, &efa)==0 ) {
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit);
@@ -1758,14 +1770,16 @@
if (efa == NULL)
return OPERATOR_CANCELLED;
- BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
- if (!BM_TestHFlag(e, BM_SEAM)) BMO_SetFlag(bm, e, BM_SELECT);
- else BMO_ClearFlag(bm, e, BM_SELECT); /* is this needed ? */
+ if (limit) {
+ BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+ if (!BM_TestHFlag(e, BM_SEAM)) BMO_SetFlag(bm, e, BM_SELECT);
+ else BMO_ClearFlag(bm, e, BM_SELECT); /* is this needed ? */
+ }
}
/* walk */
BMW_Init(&walker, bm, BMW_ISLAND,
- BMW_MASK_NOP, BM_SELECT, BMW_MASK_NOP, BMW_MASK_NOP,
+ BMW_MASK_NOP, limit ? BM_SELECT : BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP,
BMW_NIL_LAY);
e = BMW_Begin(&walker, efa);
@@ -1821,7 +1835,7 @@
}
-static int select_linked_exec(bContext *C, wmOperator *UNUSED(op))
+static int select_linked_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
@@ -1831,6 +1845,12 @@
BMEdge *e;
BMWalker walker;
+ int limit;
+
+ linked_limit_default(C, op);
+
+ limit = RNA_boolean_get(op->ptr, "limit");
+
if (em->selectmode == SCE_SELECT_FACE) {
BMFace *efa;
@@ -1843,13 +1863,15 @@
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list