Revision: 41330
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41330
Author: campbellbarton
Date: 2011-10-28 05:17:09 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
svn merge -r41310:41329 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41310
Modified Paths:
--------------
branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/collada/ArmatureImporter.cpp
branches/bmesh/blender/source/blender/collada/ArmatureImporter.h
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/datafiles/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/include/ED_datafiles.h
branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
branches/bmesh/blender/source/blender/editors/object/object_lattice.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_text/text_header.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.h
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/quicktime/SConscript
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.h
branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.h
branches/bmesh/blender/source/gameengine/VideoTexture/Texture.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/Texture.h
Added Paths:
-----------
branches/bmesh/blender/release/datafiles/blender_icons.png
branches/bmesh/blender/source/blender/editors/datafiles/blender_icons.png.c
Removed Paths:
-------------
branches/bmesh/blender/release/datafiles/blenderbuttons
branches/bmesh/blender/source/blender/editors/datafiles/blenderbuttons.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-41310
+ /trunk/blender:39992-41329
Modified: branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
2011-10-28 05:17:09 UTC (rev 41330)
@@ -67,7 +67,7 @@
Accessing datablocks
^^^^^^^^^^^^^^^^^^^^
-Python accesses Blender's data in the same way as the animation system and
user interface, which means any setting that is changed via a button can also
be changed from Python.
+Python accesses Blender's data in the same way as the animation system and
user interface; this implies that any setting that can be changed via a button
can also be changed from Python.
Accessing data from the currently loaded blend file is done with the module
:mod:`bpy.data`. This gives access to library data. For example:
@@ -101,7 +101,7 @@
Accessing attributes
^^^^^^^^^^^^^^^^^^^^
-Once you have a data block such as a material, object, groups etc. its
attributes can be accessed just like changing a setting in the interface; in
fact, the button tooltip also displays the Python attribute which can help in
finding what settings to change in a script.
+Once you have a data block, such as a material, object, groups etc., its
attributes can be accessed much like you would change a setting using the
graphical interface. In fact, the tooltip for each button also displays the
Python attribute which can help in finding what settings to change in a script.
>>> bpy.data.objects[0].name
'Camera'
@@ -179,7 +179,7 @@
But ``bpy.context.scene.objects.active = obj`` will work as expected.
-The context attributes change depending on where it is accessed. The 3D view
has different context members to the Console, so take care when accessing
context attributes that the user state is known.
+The context attributes change depending on where they are accessed. The 3D
view has different context members than the console, so take care when
accessing context attributes that the user state is known.
See :mod:`bpy.context` API reference
@@ -256,6 +256,8 @@
#. Press Ctrl+Right twice to change to the Scripting layout.
+#. Click the button labeled ``New`` and the confirmation pop up in order to
create a new text block.
+
#. Press Ctrl+V to paste the code into the text panel (the upper left frame).
#. Click on the button **Run Script**.
@@ -269,6 +271,7 @@
.. seealso:: The class members with the **bl_** prefix are documented in the
API
reference :class:`bpy.types.Operator`
+.. note:: The output from the ``main`` function is sent to the terminal; in
order to see this, be sure to :ref:`use the terminal <use_the_terminal>`.
Example Panel
-------------
@@ -285,6 +288,8 @@
#. Press Ctrl+Right twice to change to the Scripting layout
+#. Click the button labeled ``New`` and the confirmation pop up in order to
create a new text block.
+
#. Press Ctrl+V to paste the code into the text panel (the upper left frame)
#. Click on the button **Run Script**.
@@ -310,7 +315,7 @@
Blender defines a number of Python types but also uses Python native types.
-Blender's Python API can be split up into 3 categories.
+Blender's Python API can be split up into 3 categories.
Native Types
Modified: branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst
2011-10-28 05:17:09 UTC (rev 41330)
@@ -7,6 +7,8 @@
Some of these are just python features that scripters may not have thought to
use with blender, others are blender specific.
+.. _use_the_terminal:
+
Use The Terminal
================
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-28
04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-28
05:17:09 UTC (rev 41330)
@@ -102,7 +102,7 @@
# extra info, not api reference docs
# stored in ./rst/info/
INFO_DOCS = (
- ("info_quickstart.rst", "Blender/Python Quickstart: new to
blender/scripting and want to get you're feet wet?"),
+ ("info_quickstart.rst", "Blender/Python Quickstart: new to
blender/scripting and want to get your feet wet?"),
("info_overview.rst", "Blender/Python API Overview: a more complete
explanation of python integration"),
("info_best_practice.rst", "Best Practice: Conventions to follow for
writing good scripts"),
("info_tips_and_tricks.rst", "Tips and Tricks: Hints to help you while
writeing scripts for blender"),
Modified: branches/bmesh/blender/intern/ghost/SConscript
===================================================================
--- branches/bmesh/blender/intern/ghost/SConscript 2011-10-28 04:44:59 UTC
(rev 41329)
+++ branches/bmesh/blender/intern/ghost/SConscript 2011-10-28 05:17:09 UTC
(rev 41330)
@@ -107,8 +107,8 @@
if window_system in ('win32-vc', 'win64-vc'):
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs,
libtype=['intern','player'], priority = [40,15]) #,
cc_compileflags=env['CCFLAGS'].append('/WX') )
-elif env['WITH_GHOST_COCOA']: # always use Apple-gcc-4.2 for objC language,
for gnu-compilers do not support it fully yet
- env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs,
libtype=['intern','player'], priority = [40,15],
cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/g++-4.2' )
+elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc for objC
language, for gnu-compilers do not support it fully yet
+ env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs,
libtype=['intern','player'], priority = [40,15],
cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
else:
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
2011-10-28 05:17:09 UTC (rev 41330)
@@ -578,7 +578,7 @@
if (strstr(rstring,"MacBookAir") ||
(strstr(rstring,"MacBook") && (rstring[strlen(rstring)-3]>='5')
&& (rstring[strlen(rstring)-3]<='9')))
m_hasMultiTouchTrackpad = true;
- else m_hasMultiTouchTrackpad = false;
+ else m_hasMultiTouchTrackpad = true;
free( rstring );
rstring = NULL;
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
2011-10-28 05:17:09 UTC (rev 41330)
@@ -1585,30 +1585,3 @@
return GHOST_kSuccess;
}
-
-/*
-
-void glutCustomCursor(char *data1, char *data2, int size)
-{
- Pixmap source, mask;
- Cursor cursor;
- XColor fg, bg;
-
- if(XAllocNamedColor(__glutDisplay, DefaultColormap(__glutDisplay,
__glutScreen),
- "White", &fg, &fg) == 0) return;
- if(XAllocNamedColor(__glutDisplay, DefaultColormap(__glutDisplay,
__glutScreen),
- "Red", &bg, &bg) == 0) return;
-
-
- source= XCreateBitmapFromData(__glutDisplay, xdraw, data2, size, size);
- mask= XCreateBitmapFromData(__glutDisplay, xdraw, data1, size, size);
-
- cursor= XCreatePixmapCursor(__glutDisplay, source, mask, &fg, &bg, 7,
7);
-
- XFreePixmap(__glutDisplay, source);
- XFreePixmap(__glutDisplay, mask);
-
- XDefineCursor(__glutDisplay, xdraw, cursor);
-}
-
-*/
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41310
+ /trunk/blender/release:31524-41329
Copied: branches/bmesh/blender/release/datafiles/blender_icons.png (from rev
41328, trunk/blender/release/datafiles/blender_icons.png)
===================================================================
(Binary files differ)
Deleted: branches/bmesh/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
2011-10-28 05:17:09 UTC (rev 41330)
@@ -145,7 +145,11 @@
for image in bpy.data.images:
image.tag = True
- if 'FINISHED' not in bpy.ops.paint.image_from_view():
+ # opengl buffer may fail, we can't help this, but best report it.
+ try:
+ ret = bpy.ops.paint.image_from_view()
+ except RuntimeError as err:
+ self.report({'ERROR'}, str(err))
return {'CANCELLED'}
image_new = None
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
2011-10-28 04:44:59 UTC (rev 41329)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
2011-10-28 05:17:09 UTC (rev 41330)
@@ -58,7 +58,7 @@
int BKE_imtype_to_ftype(int imtype);
int BKE_imtype_is_movie(int imtype);
-struct anim *openanim(char * name, int flags, int streamindex);
+struct anim *openanim(const char *name, int flags, int streamindex);
void image_de_interlace(struct Image *ima, int odd);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
2011-10-28 04:44:59 UTC (rev 41329)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
