Revision: 41941
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41941
Author: campbellbarton
Date: 2011-11-17 05:33:02 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41932:41939
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41932
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/project_info.py
branches/bmesh/blender/build_files/cmake/project_source_info.py
branches/bmesh/blender/doc/manpage/blender.1.py
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.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
- /trunk/blender:39992-41932
+ /trunk/blender:39992-41939
Modified: branches/bmesh/blender/build_files/cmake/project_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-17
05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-17
05:33:02 UTC (rev 41941)
@@ -224,7 +224,9 @@
import subprocess
info = subprocess.Popen(["svn", "info", path],
- stdout=subprocess.PIPE).communicate()[0].decode()
+ stdout=subprocess.PIPE).communicate()[0]
+ # string version, we only want the URL
+ info = info.decode(encoding="utf-8", errors="ignore")
for l in info.split("\n"):
l = l.strip()
Modified: branches/bmesh/blender/build_files/cmake/project_source_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_source_info.py
2011-11-17 05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/build_files/cmake/project_source_info.py
2011-11-17 05:33:02 UTC (rev 41941)
@@ -73,7 +73,7 @@
def makefile_log():
import subprocess
import time
- # Check blender is not 2.5x until it supports playback again
+
print("running make with --dry-run ...")
process = subprocess.Popen(["make", "--always-make", "--dry-run",
"--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE,
@@ -85,7 +85,7 @@
out = process.stdout.read()
process.stdout.close()
print("done!", len(out), "bytes")
- return out.decode("ascii").split("\n")
+ return out.decode("utf-8", errors="ignore").split("\n")
def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
Modified: branches/bmesh/blender/doc/manpage/blender.1.py
===================================================================
--- branches/bmesh/blender/doc/manpage/blender.1.py 2011-11-17 05:03:07 UTC
(rev 41940)
+++ branches/bmesh/blender/doc/manpage/blender.1.py 2011-11-17 05:33:02 UTC
(rev 41941)
@@ -52,9 +52,9 @@
cmd = [blender_bin, "--help"]
print(" executing:", " ".join(cmd))
-blender_help = subprocess.Popen(cmd,
stdout=subprocess.PIPE).communicate()[0].decode()
+blender_help = subprocess.Popen(cmd,
stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8")
-blender_version = subprocess.Popen([blender_bin, "--version"],
stdout=subprocess.PIPE).communicate()[0].decode().strip()
+blender_version = subprocess.Popen([blender_bin, "--version"],
stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8").strip()
blender_version = blender_version.split("Build")[0]
date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-17
05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-17
05:33:02 UTC (rev 41941)
@@ -658,7 +658,7 @@
char_array = c_char_p_p.from_address(attr)
i = 0
while char_array[i] is not None:
- member = ctypes.string_at(char_array[i]).decode()
+ member = ctypes.string_at(char_array[i]).decode(encoding="ascii")
fw(".. data:: %s\n\n" % member)
member_type, is_seq = type_map[member]
fw(" :type: %s :class:`bpy.types.%s`\n\n" % ("sequence of " if
is_seq else "", member_type))
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41932
+ /trunk/blender/release:31524-41939
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
2011-11-17 05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
2011-11-17 05:33:02 UTC (rev 41941)
@@ -1835,32 +1835,32 @@
def draw(self, context):
layout = self.layout
- layout.operator("font.text_insert", text="Copyright|Alt C").text =
b'\xC2\xA9'.decode()
- layout.operator("font.text_insert", text="Registered Trademark|Alt
R").text = b'\xC2\xAE'.decode()
+ layout.operator("font.text_insert", text="Copyright|Alt C").text =
"\u00A9"
+ layout.operator("font.text_insert", text="Registered Trademark|Alt
R").text = "\u00AE"
layout.separator()
- layout.operator("font.text_insert", text="Degree Sign|Alt G").text =
b'\xC2\xB0'.decode()
- layout.operator("font.text_insert", text="Multiplication Sign|Alt
x").text = b'\xC3\x97'.decode()
- layout.operator("font.text_insert", text="Circle|Alt .").text =
b'\xC2\x8A'.decode()
- layout.operator("font.text_insert", text="Superscript 1|Alt 1").text =
b'\xC2\xB9'.decode()
- layout.operator("font.text_insert", text="Superscript 2|Alt 2").text =
b'\xC2\xB2'.decode()
- layout.operator("font.text_insert", text="Superscript 3|Alt 3").text =
b'\xC2\xB3'.decode()
- layout.operator("font.text_insert", text="Double >>|Alt >").text =
b'\xC2\xBB'.decode()
- layout.operator("font.text_insert", text="Double <<|Alt <").text =
b'\xC2\xAB'.decode()
- layout.operator("font.text_insert", text="Promillage|Alt %").text =
b'\xE2\x80\xB0'.decode()
+ layout.operator("font.text_insert", text="Degree Sign|Alt G").text =
"\u00B0"
+ layout.operator("font.text_insert", text="Multiplication Sign|Alt
x").text = "\u00D7"
+ layout.operator("font.text_insert", text="Circle|Alt .").text =
"\u008A"
+ layout.operator("font.text_insert", text="Superscript 1|Alt 1").text =
"\u00B9"
+ layout.operator("font.text_insert", text="Superscript 2|Alt 2").text =
"\u00B2"
+ layout.operator("font.text_insert", text="Superscript 3|Alt 3").text =
"\u00B3"
+ layout.operator("font.text_insert", text="Double >>|Alt >").text =
"\u00BB"
+ layout.operator("font.text_insert", text="Double <<|Alt <").text =
"\u00AB"
+ layout.operator("font.text_insert", text="Promillage|Alt %").text =
"\u2030"
layout.separator()
- layout.operator("font.text_insert", text="Dutch Florin|Alt F").text =
b'\xC2\xA4'.decode()
- layout.operator("font.text_insert", text="British Pound|Alt L").text =
b'\xC2\xA3'.decode()
- layout.operator("font.text_insert", text="Japanese Yen|Alt Y").text =
b'\xC2\xA5'.decode()
+ layout.operator("font.text_insert", text="Dutch Florin|Alt F").text =
"\u00A4"
+ layout.operator("font.text_insert", text="British Pound|Alt L").text =
"\u00A3"
+ layout.operator("font.text_insert", text="Japanese Yen|Alt Y").text =
"\u00A5"
layout.separator()
- layout.operator("font.text_insert", text="German S|Alt S").text =
b'\xC3\x9F'.decode()
- layout.operator("font.text_insert", text="Spanish Question Mark|Alt
?").text = b'\xC2\xBF'.decode()
- layout.operator("font.text_insert", text="Spanish Exclamation Mark|Alt
!").text = b'\xC2\xA1'.decode()
+ layout.operator("font.text_insert", text="German S|Alt S").text =
"\u00DF"
+ layout.operator("font.text_insert", text="Spanish Question Mark|Alt
?").text = "\u00BF"
+ layout.operator("font.text_insert", text="Spanish Exclamation Mark|Alt
!").text = "\u00A1"
class VIEW3D_MT_edit_meta(Menu):
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
2011-11-17 05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
2011-11-17 05:33:02 UTC (rev 41941)
@@ -594,6 +594,9 @@
// seq->enddisp= MIN2(seq->seq1->enddisp, seq->seq2->enddisp);
if (seq->seq1) {
+ /* XXX These resets should not be necessary, but users
used to be able to
+ * edit effect's length, leading to strange
results. See #29190. */
+ seq->startofs = seq->endofs = seq->startstill =
seq->endstill = 0;
seq->start= seq->startdisp= MAX3(seq->seq1->startdisp,
seq->seq2->startdisp, seq->seq3->startdisp);
seq->enddisp= MIN3(seq->seq1->enddisp,
seq->seq2->enddisp, seq->seq3->enddisp);
/* we cant help if strips don't overlap, it wont give
useful results.
Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
2011-11-17 05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
2011-11-17 05:33:02 UTC (rev 41941)
@@ -66,7 +66,7 @@
void *data;
} BLI_mempool_chunk;
-typedef struct BLI_mempool {
+struct BLI_mempool {
struct ListBase chunks;
int esize, csize, pchunk; /* size of elements and chunks in bytes
* and number of elements per chunk*/
@@ -76,7 +76,7 @@
BLI_freenode *free; /* free element list. Interleaved
into chunk datas.*/
int totalloc, totused; /* total number of elements allocated
in total,
* and currently in use*/
-} BLI_mempool;
+};
#define MEMPOOL_ELEM_SIZE_MIN (sizeof(void *) * 2)
Modified: branches/bmesh/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/screen/area.c 2011-11-17
05:03:07 UTC (rev 41940)
+++ branches/bmesh/blender/source/blender/editors/screen/area.c 2011-11-17
05:33:02 UTC (rev 41941)
@@ -169,8 +169,13 @@
static void area_draw_azone(short x1, short y1, short x2, short y2)
{
- int dx= floor(0.3f*(x2-x1));
- int dy= floor(0.3f*(y2-y1));
+ int dx = x2 - x1;
+ int dy = y2 - y1;
+
+ dx= copysign(ceil(0.3f*fabs(dx)), dx);
+ dy= copysign(ceil(0.3f*fabs(dy)), dy);
+
+ glEnable(GL_LINE_SMOOTH);
glColor4ub(255, 255, 255, 180);
fdrawline(x1, y2, x2, y1);
@@ -185,9 +190,10 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
