[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60758] tags/blender-2.69-release/blender: svn merge ^/trunk/ blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755
Campbell Barton
ideasman42 at gmail.com
Mon Oct 14 22:21:28 CEST 2013
Revision: 60758
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60758
Author: campbellbarton
Date: 2013-10-14 20:21:27 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755
Modified Paths:
--------------
tags/blender-2.69-release/blender/intern/cycles/device/device.cpp
tags/blender-2.69-release/blender/release/scripts/freestyle/style_modules/parameter_editor.py
tags/blender-2.69-release/blender/release/scripts/modules/rna_keymap_ui.py
tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/properties_material.py
tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/space_image.py
tags/blender-2.69-release/blender/source/blender/blenkernel/BKE_mesh.h
tags/blender-2.69-release/blender/source/blender/blenkernel/intern/armature.c
tags/blender-2.69-release/blender/source/blender/blenkernel/intern/mesh_evaluate.c
tags/blender-2.69-release/blender/source/blender/blenkernel/intern/node.c
tags/blender-2.69-release/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
tags/blender-2.69-release/blender/source/blender/blenlib/intern/math_rotation.c
tags/blender-2.69-release/blender/source/blender/bmesh/operators/bmo_symmetrize.c
tags/blender-2.69-release/blender/source/blender/editors/animation/anim_markers.c
tags/blender-2.69-release/blender/source/blender/editors/armature/pose_lib.c
tags/blender-2.69-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.69-release/blender/source/blender/editors/interface/interface_layout.c
tags/blender-2.69-release/blender/source/blender/editors/mesh/editmesh_loopcut.c
tags/blender-2.69-release/blender/source/blender/editors/sculpt_paint/paint_image.c
tags/blender-2.69-release/blender/source/blender/editors/sculpt_paint/paint_intern.h
tags/blender-2.69-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
tags/blender-2.69-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c
tags/blender-2.69-release/blender/source/blender/editors/sculpt_paint/sculpt.c
tags/blender-2.69-release/blender/source/blender/editors/space_clip/clip_editor.c
tags/blender-2.69-release/blender/source/blender/editors/space_text/text_autocomplete.c
tags/blender-2.69-release/blender/source/blender/editors/space_view3d/drawmesh.c
tags/blender-2.69-release/blender/source/blender/imbuf/intern/indexer.c
tags/blender-2.69-release/blender/source/blender/makesdna/DNA_node_types.h
tags/blender-2.69-release/blender/source/blender/makesrna/intern/rna_access.c
tags/blender-2.69-release/blender/source/blender/makesrna/intern/rna_meta.c
tags/blender-2.69-release/blender/source/blender/render/intern/source/pipeline.c
tags/blender-2.69-release/blender/source/blender/render/intern/source/sss.c
tags/blender-2.69-release/blender/source/blender/windowmanager/WM_api.h
tags/blender-2.69-release/blender/source/blender/windowmanager/intern/wm_dragdrop.c
tags/blender-2.69-release/blender/source/blender/windowmanager/intern/wm_files.c
tags/blender-2.69-release/blender/source/blender/windowmanager/intern/wm_operators.c
tags/blender-2.69-release/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Property Changed:
----------------
tags/blender-2.69-release/blender/
tags/blender-2.69-release/blender/source/blender/editors/interface/interface.c
Property changes on: tags/blender-2.69-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:60592-60596
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:60592-60596,60599,60605,60626,60630,60635,60639,60644,60649,60673-60675,60680,60682-60683,60685,60689,60695,60703,60707-60709,60712,60723-60724,60731,60740,60742-60743,60747,60749,60752-60753,60755
Modified: tags/blender-2.69-release/blender/intern/cycles/device/device.cpp
===================================================================
--- tags/blender-2.69-release/blender/intern/cycles/device/device.cpp 2013-10-14 20:13:40 UTC (rev 60757)
+++ tags/blender-2.69-release/blender/intern/cycles/device/device.cpp 2013-10-14 20:21:27 UTC (rev 60758)
@@ -56,18 +56,6 @@
{
pixels_copy_from(rgba, y, w, h);
- GLuint texid;
- glGenTextures(1, &texid);
- glBindTexture(GL_TEXTURE_2D, texid);
- if(rgba.data_type == TYPE_HALF)
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, (void*)rgba.data_pointer);
- else
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (void*)rgba.data_pointer);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
- glEnable(GL_TEXTURE_2D);
-
if(transparent) {
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -75,30 +63,57 @@
glColor3f(1.0f, 1.0f, 1.0f);
- glPushMatrix();
- glTranslatef(0.0f, (float)dy, 0.0f);
+ if(rgba.data_type == TYPE_HALF) {
+ /* draw half float texture, GLSL shader for display transform assumed to be bound */
+ GLuint texid;
+ glGenTextures(1, &texid);
+ glBindTexture(GL_TEXTURE_2D, texid);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, (void*)rgba.data_pointer);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glBegin(GL_QUADS);
-
- glTexCoord2f(0.0f, 0.0f);
- glVertex2f(0.0f, 0.0f);
- glTexCoord2f(1.0f, 0.0f);
- glVertex2f((float)width, 0.0f);
- glTexCoord2f(1.0f, 1.0f);
- glVertex2f((float)width, (float)height);
- glTexCoord2f(0.0f, 1.0f);
- glVertex2f(0.0f, (float)height);
+ glEnable(GL_TEXTURE_2D);
- glEnd();
+ glPushMatrix();
+ glTranslatef(0.0f, (float)dy, 0.0f);
- glPopMatrix();
+ glBegin(GL_QUADS);
+
+ glTexCoord2f(0.0f, 0.0f);
+ glVertex2f(0.0f, 0.0f);
+ glTexCoord2f(1.0f, 0.0f);
+ glVertex2f((float)width, 0.0f);
+ glTexCoord2f(1.0f, 1.0f);
+ glVertex2f((float)width, (float)height);
+ glTexCoord2f(0.0f, 1.0f);
+ glVertex2f(0.0f, (float)height);
+ glEnd();
+
+ glPopMatrix();
+
+ glBindTexture(GL_TEXTURE_2D, 0);
+ glDisable(GL_TEXTURE_2D);
+ glDeleteTextures(1, &texid);
+ }
+ else {
+ /* fallback for old graphics cards that don't support GLSL, half float,
+ * and non-power-of-two textures */
+ glPixelZoom((float)width/(float)w, (float)height/(float)h);
+ glRasterPos2f(0, dy);
+
+ uint8_t *pixels = (uint8_t*)rgba.data_pointer;
+
+ pixels += 4*y*w;
+
+ glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+
+ glRasterPos2f(0.0f, 0.0f);
+ glPixelZoom(1.0f, 1.0f);
+ }
+
if(transparent)
glDisable(GL_BLEND);
-
- glBindTexture(GL_TEXTURE_2D, 0);
- glDisable(GL_TEXTURE_2D);
- glDeleteTextures(1, &texid);
}
Device *Device::create(DeviceInfo& info, Stats &stats, bool background)
Modified: tags/blender-2.69-release/blender/release/scripts/freestyle/style_modules/parameter_editor.py
===================================================================
--- tags/blender-2.69-release/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-10-14 20:13:40 UTC (rev 60757)
+++ tags/blender-2.69-release/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-10-14 20:21:27 UTC (rev 60758)
@@ -32,7 +32,7 @@
FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \
PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \
SpatialNoiseShader, StrokeAttribute, StrokeShader, TipRemoverShader, TrueBP1D, TrueUP1D, UnaryPredicate0D, \
- UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D, ContextFunctions
+ UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D, ContextFunctions, TVertex
from Functions0D import CurveMaterialF0D
from PredicatesU1D import pyNatureUP1D
from logical_operators import AndUP1D, NotUP1D, OrUP1D
@@ -1085,6 +1085,8 @@
it3.increment()
it4.increment()
+def is_tvertex(svertex):
+ return type(svertex.viewvertex) is TVertex
class StrokeCleaner(StrokeShader):
def shade(self, stroke):
@@ -1092,7 +1094,10 @@
seg1 = sv2.point - sv1.point
seg2 = sv3.point - sv2.point
seg3 = sv4.point - sv3.point
- if seg1.dot(seg2) < 0.0 and seg2.dot(seg3) < 0.0:
+ if not ((is_tvertex(sv2.first_svertex) and is_tvertex(sv2.second_svertex)) or
+ (is_tvertex(sv3.first_svertex) and is_tvertex(sv3.second_svertex))):
+ continue
+ if seg1.dot(seg2) < 0.0 and seg2.dot(seg3) < 0.0 and seg2.length < 0.01:
#print(sv2.first_svertex.viewvertex)
#print(sv2.second_svertex.viewvertex)
#print(sv3.first_svertex.viewvertex)
Modified: tags/blender-2.69-release/blender/release/scripts/modules/rna_keymap_ui.py
===================================================================
--- tags/blender-2.69-release/blender/release/scripts/modules/rna_keymap_ui.py 2013-10-14 20:13:40 UTC (rev 60757)
+++ tags/blender-2.69-release/blender/release/scripts/modules/rna_keymap_ui.py 2013-10-14 20:21:27 UTC (rev 60758)
@@ -74,15 +74,14 @@
row.prop(km, "show_expanded_children", text="", emboss=False)
row.label(text=km.name, text_ctxt=i18n_contexts.id_windowmanager)
- row.label()
- row.label()
+ subrow = row.row()
+ subrow.alignment = 'RIGHT'
- if km.is_modal:
- row.label(text="", icon='LINKED')
if km.is_user_modified:
- row.operator("wm.keymap_restore", text="Restore")
- else:
- row.label()
+ subrow.operator("wm.keymap_restore", text="Restore")
+ if km.is_modal:
+ subrow.label(text="", icon='LINKED')
+ del subrow
if km.show_expanded_children:
if children:
Modified: tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/properties_material.py 2013-10-14 20:13:40 UTC (rev 60757)
+++ tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/properties_material.py 2013-10-14 20:21:27 UTC (rev 60758)
@@ -518,7 +518,7 @@
layout.active = (sss.use) and (not mat.use_shadeless)
row = layout.row().split()
- sub = row.row(align=True).split(percentage=0.75)
+ sub = row.row(align=True).split(align=True, percentage=0.75)
sub.menu("MATERIAL_MT_sss_presets", text=bpy.types.MATERIAL_MT_sss_presets.bl_label)
sub.operator("material.sss_preset_add", text="", icon='ZOOMIN')
sub.operator("material.sss_preset_add", text="", icon='ZOOMOUT').remove_active = True
Modified: tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/space_image.py 2013-10-14 20:13:40 UTC (rev 60757)
+++ tags/blender-2.69-release/blender/release/scripts/startup/bl_ui/space_image.py 2013-10-14 20:21:27 UTC (rev 60758)
@@ -106,7 +106,6 @@
layout.operator("uv.select_all").action = 'TOGGLE'
layout.operator("uv.select_all", text="Inverse").action = 'INVERT'
- layout.operator("uv.select_split")
layout.separator()
Modified: tags/blender-2.69-release/blender/source/blender/blenkernel/BKE_mesh.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list