[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56419] branches/vgroup_modifiers: svn merge -r 56335:56418 --accept 'theirs-full' https://svn.blender.org/ svnroot/bf-blender/trunk/blender

Bastien Montagne montagne29 at wanadoo.fr
Tue Apr 30 20:29:05 CEST 2013 

Revision: 56419
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56419
Author:   mont29
Date:     2013-04-30 18:29:04 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
svn merge -r 56335:56418 --accept 'theirs-full' https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/build_files/scons/tools/btools.py
    branches/vgroup_modifiers/doc/python_api/sphinx_doc_gen.py
    branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
    branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/osl/SConscript
    branches/vgroup_modifiers/intern/ffmpeg/ffmpeg_compat.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/vgroup_modifiers/intern/opencolorio/ocio_impl_glsl.cc
    branches/vgroup_modifiers/release/datafiles/colormanagement/config.ocio
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/vgroup_modifiers/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/vgroup_modifiers/release/scripts/presets/keyconfig/3dsmax.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
    branches/vgroup_modifiers/release/scripts/startup/nodeitems_builtins.py
    branches/vgroup_modifiers/source/blender/blenfont/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenfont/SConscript
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_glyph.c
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_brush.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/colortools.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/displist.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/editmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/image_gen.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_color.h
    branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_base_inline.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color_inline.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/string_utf8.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/uvproject.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/versioning_250.c
    branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_interp.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_wireframe.c
    branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp
    branches/vgroup_modifiers/source/blender/compositor/intern/COM_compositor.cpp
    branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
    branches/vgroup_modifiers/source/blender/editors/interface/resources.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
    branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
    branches/vgroup_modifiers/source/blender/editors/render/render_preview.c
    branches/vgroup_modifiers/source/blender/editors/screen/glutil.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_utils.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_context.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/space_clip.c
    branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tree.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/space_sequencer.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_ruler.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_ops.c
    branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/Functions1D.cpp
    branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h
    branches/vgroup_modifiers/source/blender/imbuf/intern/colormanagement.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/rectop.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_userdef_types.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_lamp.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_rigidbody.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c
    branches/vgroup_modifiers/source/blender/python/SConscript
    branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_app_build_options.c
    branches/vgroup_modifiers/source/blender/quicktime/apple/qtkit_import.m
    branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_import.c
    branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
    branches/vgroup_modifiers/source/creator/creator.c
    branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageBuff.cpp

Added Paths:
-----------
    branches/vgroup_modifiers/source/blender/blenlib/BLI_math_color_blend.h
    branches/vgroup_modifiers/source/blender/blenlib/intern/math_color_blend_inline.c

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
   - /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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56335
   + /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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-56418

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/CMakeLists.txt	2013-04-30 18:29:04 UTC (rev 56419)
@@ -417,13 +417,21 @@
 # otherwise if the user disabled
 if(NOT WITH_BOOST)
 	# Explicitly disabled. so disable all deps.
-	set(WITH_CYCLES         OFF)
-	set(WITH_MOD_BOOLEAN    OFF)
-	set(WITH_AUDASPACE      OFF)
-	set(WITH_INTERNATIONAL  OFF)
+	macro(set_and_warn
+		_setting _val)
+		if(${${_setting}})
+			message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
+		endif()
+		set(${_setting} ${_val})
+	endmacro()
 
-	set(WITH_OPENAL         OFF)  # depends on AUDASPACE
-	set(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_CYCLES         OFF)
+	set_and_warn(WITH_MOD_BOOLEAN    OFF)
+	set_and_warn(WITH_AUDASPACE      OFF)
+	set_and_warn(WITH_INTERNATIONAL  OFF)
+
+	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
 elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
 	# Keep enabled
 else()

Modified: branches/vgroup_modifiers/build_files/scons/tools/btools.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/tools/btools.py	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/build_files/scons/tools/btools.py	2013-04-30 18:29:04 UTC (rev 56419)
@@ -136,7 +136,7 @@
             'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
             'WITHOUT_BF_INSTALL',
-            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY'
+            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY',
             'WITHOUT_BF_OVERWRITE_INSTALL',
             'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH', 'WITH_BF_STATICOPENMP', 'BF_OPENMP_STATIC_STATIC',
             'WITH_GHOST_COCOA',

Modified: branches/vgroup_modifiers/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/vgroup_modifiers/doc/python_api/sphinx_doc_gen.py	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/doc/python_api/sphinx_doc_gen.py	2013-04-30 18:29:04 UTC (rev 56419)
@@ -70,6 +70,14 @@
 
 import rna_info     # blender module
 
+
+def rna_info_BuildRNAInfo_cache():
+    if rna_info_BuildRNAInfo_cache.ret is None:
+        rna_info_BuildRNAInfo_cache.ret = rna_info.BuildRNAInfo()
+    return rna_info_BuildRNAInfo_cache.ret
+rna_info_BuildRNAInfo_cache.ret = None
+# --- end rna_info cache
+
 # import rpdb2; rpdb2.start_embedded_debugger('test')
 import os
 import sys
@@ -302,6 +310,12 @@
     BPY_LOGGER.debug("Warning: Built without 'aud' module, docs incomplete...")
     EXCLUDE_MODULES = list(EXCLUDE_MODULES) + ["aud"]
 
+try:
+    __import__("freestyle")
+except ImportError:
+    BPY_LOGGER.debug("Warning: Built without 'freestyle' module, docs incomplete...")
+    EXCLUDE_MODULES = list(EXCLUDE_MODULES) + ["freestyle"]
+
 # examples
 EXAMPLES_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "examples"))
 EXAMPLE_SET = set()
@@ -986,6 +1000,7 @@
     "texture": ("Texture", False),
     "texture_slot": ("MaterialTextureSlot", False),
     "texture_user": ("ID", False),
+    "texture_user_property": ("Property", False),
     "vertex_paint_object": ("Object", False),
     "visible_bases": ("ObjectBase", True),
     "visible_bones": ("EditBone", True),
@@ -1009,6 +1024,47 @@
     fw("\n")
     fw("Note that all context values are readonly, but may be modified through the data api or by running operators\n\n")
 
+    def write_contex_cls():
+
+        fw(title_string("Global Context", "-"))
+        fw("These properties are avilable in any contexts.\n\n")
+
+        # very silly. could make these global and only access once.
+        # structs, funcs, ops, props = rna_info.BuildRNAInfo()
+        structs, funcs, ops, props = rna_info_BuildRNAInfo_cache()
+        struct = structs[("", "Context")]
+        struct_blacklist = RNA_BLACKLIST.get(struct.identifier, ())
+        del structs, funcs, ops, props
+
+        sorted_struct_properties = struct.properties[:]
+        sorted_struct_properties.sort(key=lambda prop: prop.identifier)
+
+        # First write RNA
+        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:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID)
+            fw(".. data:: %s\n\n" % prop.identifier)
+            if prop.description:
+                fw("   %s\n\n" % prop.description)
+
+            # special exception, cant use genric code here for enums
+            if prop.type == "enum":
+                enum_text = pyrna_enum2sphinx(prop)
+                if enum_text:
+                    write_indented_lines("   ", fw, enum_text)
+                    fw("\n")
+                del enum_text
+            # end enum exception
+
+            fw("   :type: %s\n\n" % type_descr)
+
+    write_contex_cls()
+    del write_contex_cls
+    # end
+
     # nasty, get strings directly from blender because there is no other way to get it
     import ctypes
 
@@ -1079,7 +1135,9 @@
 def pyrna2sphinx(basepath):
     """ bpy.types and bpy.ops
     """
-    structs, funcs, ops, props = rna_info.BuildRNAInfo()
+    # structs, funcs, ops, props = rna_info.BuildRNAInfo()
+    structs, funcs, ops, props = rna_info_BuildRNAInfo_cache()
+
     if FILTER_BPY_TYPES is not None:
         structs = {k: v for k, v in structs.items() if k[1] in FILTER_BPY_TYPES}
 

Modified: branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
===================================================================
--- branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp	2013-04-30 18:29:04 UTC (rev 56419)
@@ -766,7 +766,7 @@
 
 
 	///avoid collision response between two static objects
-	if (!solverBodyA || (!solverBodyA->m_originalBody && (!solverBodyB || !solverBodyB->m_originalBody)))
+	if (!solverBodyA || (solverBodyA->m_invMass.isZero() && (!solverBodyB || solverBodyB->m_invMass.isZero())))
 		return;
 
 	int rollingFriction=1;

Modified: branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py	2013-04-30 18:29:04 UTC (rev 56419)
@@ -896,8 +896,9 @@
 
             if pin_id:
                 col.template_ID(space, "pin_id")
-            elif user:
-                col.template_ID(user, "texture", new="texture.new")
+            else:
+                propname = context.texture_user_property.identifier
+                col.template_ID(user, propname, new="texture.new")
 
             if tex:
                 split = layout.split(percentage=0.2)

Modified: branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp	2013-04-30 18:29:04 UTC (rev 56419)
@@ -501,6 +501,9 @@
 
 bool BlenderSession::draw(int w, int h)
 {
+	/* pause in redraw in case update is not being called due to final render */
+	session->set_pause(BlenderSync::get_session_pause(b_scene, background));
+
 	/* before drawing, we verify camera and viewport size changes, because
 	 * we do not get update callbacks for those, we must detect them here */
 	if(session->ready_to_reset()) {

Modified: branches/vgroup_modifiers/intern/cycles/kernel/osl/SConscript
===================================================================
--- branches/vgroup_modifiers/intern/cycles/kernel/osl/SConscript	2013-04-30 17:30:40 UTC (rev 56418)
+++ branches/vgroup_modifiers/intern/cycles/kernel/osl/SConscript	2013-04-30 18:29:04 UTC (rev 56419)
@@ -44,10 +44,10 @@
 defs.append('WITH_OSL')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list