[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42174] branches/bmesh/blender: svn merge ^/trunk/blender -r42139:42172
Campbell Barton
ideasman42 at gmail.com
Sat Nov 26 17:29:20 CET 2011
Revision: 42174
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42174
Author: campbellbarton
Date: 2011-11-26 16:29:14 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42139:42172
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42139
Modified Paths:
--------------
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/extern/libmv/SConscript
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
branches/bmesh/blender/source/blender/blenkernel/BKE_pointcache.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/packedFile.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/text.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/storage.c
branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.h
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/physics/physics_pointcache.c
branches/bmesh/blender/source/blender/editors/render/render_opengl.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/editors/space_console/space_console.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.c
branches/bmesh/blender/source/blender/editors/space_file/fsmenu.c
branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/util/ed_util.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/bmesh/blender/source/blender/imbuf/intern/IMB_indexer.h
branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_group.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_key.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lattice.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_meta.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_speaker.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/blender/python/intern/bpy_app.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_array.c
branches/bmesh/blender/source/blender/python/intern/bpy_traceback.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_gesture.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/CMakeLists.txt
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-42139
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42172
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-26 16:29:14 UTC (rev 42174)
@@ -110,7 +110,13 @@
("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"),
)
+# only support for properties atm.
+RNA_BLACKLIST = {
+ # messes up PDF!, really a bug but for now just workaround.
+ "UserPreferencesSystem": {"language", },
+ }
+
# -----------------------------------------------------------------------------
# configure compile time options
@@ -757,22 +763,23 @@
fw = file.write
base_id = getattr(struct.base, "identifier", "")
+ struct_id = struct.identifier
if _BPY_STRUCT_FAKE:
if not base_id:
base_id = _BPY_STRUCT_FAKE
if base_id:
- title = "%s(%s)" % (struct.identifier, base_id)
+ title = "%s(%s)" % (struct_id, base_id)
else:
- title = struct.identifier
+ title = struct_id
write_title(fw, title, "=")
fw(".. module:: bpy.types\n\n")
# docs first?, ok
- write_example_ref("", fw, "bpy.types.%s" % struct.identifier)
+ write_example_ref("", fw, "bpy.types.%s" % struct_id)
base_ids = [base.identifier for base in struct.get_bases()]
@@ -801,9 +808,9 @@
base_id = _BPY_STRUCT_FAKE
if base_id:
- fw(".. class:: %s(%s)\n\n" % (struct.identifier, base_id))
+ fw(".. class:: %s(%s)\n\n" % (struct_id, base_id))
else:
- fw(".. class:: %s\n\n" % struct.identifier)
+ fw(".. class:: %s\n\n" % struct_id)
fw(" %s\n\n" % struct.description)
@@ -811,7 +818,15 @@
sorted_struct_properties = struct.properties[:]
sorted_struct_properties.sort(key=lambda prop: prop.identifier)
+ # support blacklisting props
+ struct_blacklist = RNA_BLACKLIST.get(struct_id, ())
+
for prop in sorted_struct_properties:
+
+ # support blacklisting props
+ if prop.identifier in struct_blacklist:
+ continue
+
type_descr = prop.get_type_description(class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)
# readonly properties use "data" directive, variables properties use "attribute" directive
if 'readonly' in type_descr:
@@ -860,7 +875,7 @@
descr = prop.name
fw(" `%s`, %s, %s\n\n" % (prop.identifier, descr, type_descr))
- write_example_ref(" ", fw, "bpy.types." + struct.identifier + "." + func.identifier)
+ write_example_ref(" ", fw, "bpy.types." + struct_id + "." + func.identifier)
fw("\n")
@@ -876,7 +891,7 @@
py_func = None
for identifier, py_func in py_funcs:
- py_c_func2sphinx(" ", fw, "bpy.types", struct.identifier, identifier, py_func, is_class=True)
+ py_c_func2sphinx(" ", fw, "bpy.types", struct_id, identifier, py_func, is_class=True)
lines = []
@@ -955,7 +970,7 @@
fw("\n")
# docs last?, disable for now
- # write_example_ref("", fw, "bpy.types.%s" % struct.identifier)
+ # write_example_ref("", fw, "bpy.types.%s" % struct_id)
file.close()
if "bpy.types" not in EXCLUDE_MODULES:
Modified: branches/bmesh/blender/extern/libmv/SConscript
===================================================================
--- branches/bmesh/blender/extern/libmv/SConscript 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/extern/libmv/SConscript 2011-11-26 16:29:14 UTC (rev 42174)
@@ -46,16 +46,16 @@
defs.append('NDEBUG')
else:
if not env['BF_DEBUG']:
- cflags_libmv = Split(env['REL_CFLAGS'])
- ccflags_libmv = Split(env['REL_CCFLAGS'])
- cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+ cflags_libmv += Split(env['REL_CFLAGS'])
+ ccflags_libmv += Split(env['REL_CCFLAGS'])
+ cxxflags_libmv += Split(env['REL_CXXFLAGS'])
else:
src += env.Glob("third_party/glog/src/*.cc")
incs += ' ./third_party/glog/src'
if not env['BF_DEBUG']:
- cflags_libmv = Split(env['REL_CFLAGS'])
- ccflags_libmv = Split(env['REL_CCFLAGS'])
- cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+ cflags_libmv += Split(env['REL_CFLAGS'])
+ ccflags_libmv += Split(env['REL_CCFLAGS'])
+ cxxflags_libmv += Split(env['REL_CXXFLAGS'])
incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42139
+ /trunk/blender/release:31524-42172
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2011-11-26 16:29:14 UTC (rev 42174)
@@ -19,9 +19,7 @@
# <pep8 compliant>
import bpy
import os
-import shutil
from bpy.types import Operator
-from bpy_extras.io_utils import unpack_list, unpack_face_list
from mathutils import Vector, Matrix
@@ -128,6 +126,8 @@
return (sc.type == 'CLIP_EDITOR') and sc.clip
def execute(self, context):
+ from bpy_extras.io_utils import unpack_list
+
sc = context.space_data
clip = sc.clip
@@ -171,6 +171,8 @@
return wm.invoke_confirm(self, event)
def _rmproxy(self, abspath):
+ import shutil
+
if not os.path.exists(abspath):
return
@@ -648,6 +650,8 @@
@staticmethod
def _createMesh(scene, name, vertices, faces):
+ from bpy_extras.io_utils import unpack_list, unpack_face_list
+
mesh = bpy.data.meshes.new(name=name)
mesh.vertices.add(len(vertices))
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-11-26 16:29:14 UTC (rev 42174)
@@ -36,9 +36,9 @@
layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT')
layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True
layout.separator()
- layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock All").action = 'SELECT'
- layout.operator("object.vertex_group_lock", icon='UNLOCK', text="UnLock All").action = 'DESELECT'
- layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock Invert All").action = 'INVERT'
+ layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock All").action = 'SELECT'
+ layout.operator("object.vertex_group_lock", icon='UNLOCKED', text="UnLock All").action = 'DESELECT'
+ layout.operator("object.vertex_group_lock", icon='LOCKED', text="Lock Invert All").action = 'INVERT'
class MESH_MT_shape_key_specials(Menu):
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-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-26 16:29:14 UTC (rev 42174)
@@ -1763,7 +1763,7 @@
edit_object = context.edit_object
if edit_object.type == 'CURVE':
- layout.operator("transform.transform", text="Tilt").mode = 'TILT'
+ layout.operator("transform.tilt")
layout.operator("curve.tilt_clear")
layout.operator("curve.separate")
Modified: branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c 2011-11-26 16:29:14 UTC (rev 42174)
@@ -129,7 +129,7 @@
char *blf_dir_search(const char *file)
{
DirBLF *dir;
- char full_path[FILE_MAXDIR+FILE_MAXFILE];
+ char full_path[FILE_MAX];
char *s= NULL;
for(dir=global_font_dir.first; dir; dir= dir->next) {
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-11-26 16:29:14 UTC (rev 42174)
@@ -612,7 +612,7 @@
int sculpt_get_deform_matrices(struct Scene *scene, struct Object *ob,
float (**deformmats)[3][3], float (**deformcos)[3]);
-void weight_to_rgb(float input, float *fr, float *fg, float *fb);
+void weight_to_rgb(float r_rgb[3], const float weight);
/* convert layers requested by a GLSL material to actually available layers in
* the DerivedMesh, with both a pointer for arrays and an offset for editmesh */
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_image.h 2011-11-26 16:15:32 UTC (rev 42173)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_image.h 2011-11-26 16:29:14 UTC (rev 42174)
@@ -60,10 +60,10 @@
int BKE_imtype_to_ftype(char imtype);
int BKE_imtype_is_movie(const char imtype);
-int BKE_imtype_supports_alpha(const char imtype);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list