[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41555] branches/soc-2011-tomato: Merging r41536 through r41554 from trunk into soc-2011-tomato

Sergey Sharybin g.ulairi at gmail.com
Sat Nov 5 12:50:41 CET 2011 

Revision: 41555
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41555
Author:   nazgul
Date:     2011-11-05 11:50:40 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Merging r41536 through r41554 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41536
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41554

Modified Paths:
--------------
    branches/soc-2011-tomato/GNUmakefile
    branches/soc-2011-tomato/doc/doxygen/Doxyfile
    branches/soc-2011-tomato/doc/doxygen/doxygen.source
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_Buttons.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventWheel.h
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata_file.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_property.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_unit.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/property.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
    branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_armature.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_fluidsim.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_logic.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_particle.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
    branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
    branches/soc-2011-tomato/source/blender/editors/space_file/filelist.h
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/util/editmode_undo.c
    branches/soc-2011-tomato/source/blender/editors/util/undo.c
    branches/soc-2011-tomato/source/blender/editors/util/util_intern.h
    branches/soc-2011-tomato/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2011-tomato/source/blender/python/generic/bgl.c
    branches/soc-2011-tomato/source/blender/python/generic/bgl.h
    branches/soc-2011-tomato/source/blender/python/generic/blf_py_api.c
    branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-tomato/source/blender/python/generic/noise_py_api.c
    branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface_atexit.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_traceback.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_util.c
    branches/soc-2011-tomato/source/blender/python/intern/gpu.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.h
    branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
    branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41535
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41554

Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/GNUmakefile	2011-11-05 11:50:40 UTC (rev 41555)
@@ -151,6 +151,7 @@
 	@echo ""
 	@echo "Documentation Targets (not assosiated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
+	@echo "  * doc_doxy - generate doxygen C/C++ docs"
 	@echo "  * doc_dna  - generate blender file format reference"
 	@echo "  * doc_man  - generate manpage"
 	@echo ""
@@ -238,9 +239,13 @@
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py:
 	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
-	cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
+doc_doxy:
+	cd doc/doxygen; doxygen 
+	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
+
 doc_dna:
 	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"

Modified: branches/soc-2011-tomato/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2011-tomato/doc/doxygen/Doxyfile	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/doc/doxygen/Doxyfile	2011-11-05 11:50:40 UTC (rev 41555)
@@ -44,7 +44,7 @@
 # exceed 55 pixels and the maximum width should not exceed 200 pixels. 
 # Doxygen will copy the logo to the output directory.
 
-PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/blender.png
+PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/apps/blender.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -193,7 +193,7 @@
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 4
 
 # This tag can be used to specify a number of aliases that acts 
 # as commands in the documentation. An alias has the form "name=value". 

Modified: branches/soc-2011-tomato/doc/doxygen/doxygen.source
===================================================================
--- branches/soc-2011-tomato/doc/doxygen/doxygen.source	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/doc/doxygen/doxygen.source	2011-11-05 11:50:40 UTC (rev 41555)
@@ -22,6 +22,10 @@
  *  \ingroup python
  */
 
+/** \defgroup pymathutils Python Mathutils
+ *  \ingroup python
+ */
+
 /** \defgroup pythonintern Python RNA and Operators
  *  \ingroup python
  */

Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2011-11-05 11:50:40 UTC (rev 41555)
@@ -150,10 +150,6 @@
     return isinstance(value, tuple) and type(tuple) != tuple and hasattr(value, "n_fields")
 
 
-def module_id_as_ref(name):
-    return "mod_" + name.replace(".", "__")
-
-
 def undocumented_message(module_name, type_name, identifier):
     if str(type_name).startswith('<module'):
         preloadtitle = '%s.%s' % (module_name, identifier)
@@ -391,10 +387,6 @@
 
     write_title(fw, "%s (%s)" % (title, module_name), "=")
 
-    # write reference, annoying since we should be able to direct reference the
-    # modules but we cant always!
-    fw(".. _%s:\n\n" % module_id_as_ref(module_name))
-
     fw(".. module:: %s\n\n" % module_name)
 
     if module.__doc__:
@@ -453,21 +445,20 @@
         if type(descr) == MemberDescriptorType:
             if descr.__doc__:
                 value = getattr(module, key, None)
+
                 value_type = type(value)
                 descr_sorted.append((key, descr, value, type(value)))
     # sort by the valye type
     descr_sorted.sort(key=lambda descr_data: str(descr_data[3]))
     for key, descr, value, value_type in descr_sorted:
-        type_name = value_type.__name__
-        py_descr2sphinx("", fw, descr, module_name, type_name, key)
 
+        # must be documented as a submodule
         if is_struct_seq(value):
-            # ack, cant use typical reference because we double up once here
-            # and one fort he module!
-            full_name = "%s.%s" % (module_name, type_name)
-            fw("   :ref:`%s submodule details <%s>`\n\n\n" % (full_name, module_id_as_ref(full_name)))
-            del full_name
+            continue
 
+        type_name = value_type.__name__
+        py_descr2sphinx("", fw, descr, module_name, type_name, key)
+
         attribute_set.add(key)
 
     del key, descr, descr_sorted

Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h	2011-11-05 11:50:40 UTC (rev 41555)
@@ -454,7 +454,7 @@
 /**
  * Pauses a playing sound after a specific amount of time.
  * \param handle The handle to the sound.
- * \param time The time in seconds.
+ * \param seconds The time in seconds.
  * \return The silence handle.
  */
 extern AUD_Handle* AUD_pauseAfter(AUD_Handle* handle, float seconds);

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_Buttons.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_Buttons.h	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_Buttons.h	2011-11-05 11:50:40 UTC (rev 41555)
@@ -52,15 +52,15 @@
 
 	/**
 	 * Returns the state of a single button.
-	 * @param mask. Key button to return.
+	 * @param mask Key button to return.
 	 * @return The state of the button (pressed == true).
 	 */
 	virtual bool get(GHOST_TButtonMask mask) const;
 
 	/**
 	 * Updates the state of a single button.
-	 * @param mask. Button state to update.
-	 * @param down. The new state of the button.
+	 * @param mask Button state to update.
+	 * @param down The new state of the button.
 	 */
 	virtual void set(GHOST_TButtonMask mask, bool down);
 

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h	2011-11-05 11:50:40 UTC (rev 41555)
@@ -72,7 +72,7 @@
 	/**
 	 * Returns the number of display settings for this display device.
 	 * @param display The index of the display to query with 0 <= display < getNumDisplays().
-	 * @param setting The number of settings of the display device with this index.
+	 * @param numSettings The number of settings of the display device with this index.
 	 * @return Indication of success.
 	 */
 	virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const;

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventWheel.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventWheel.h	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventWheel.h	2011-11-05 11:50:40 UTC (rev 41555)
@@ -26,7 +26,7 @@
  */
 
 /** \file ghost/intern/GHOST_EventWheel.h
- *  \ingroup GHOSTeel.h
+ *  \ingroup GHOST
  * Declaration of GHOST_EventWheel class.
  */
 

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-05 11:11:06 UTC (rev 41554)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-05 11:50:40 UTC (rev 41555)
@@ -172,26 +172,32 @@
 class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
     bl_context = "mesh_edit"
     bl_label = "Mesh Options"
+    
+    @classmethod
+    def poll(cls, context):
+        return context.active_object
 
     def draw(self, context):
         layout = self.layout
 
         ob = context.active_object
 
-        if ob:
-            mesh = ob.data
-            col = layout.column(align=True)
-            col.prop(mesh, "use_mirror_x")
-            sub = col.column()
-            sub.active = ob.data.use_mirror_x
-            sub.prop(mesh, "use_mirror_topology")
+        tool_settings = context.tool_settings
+        mesh = ob.data
 
-            ts = context.tool_settings
+        col = layout.column(align=True)
+        col.active = tool_settings.proportional_edit == 'DISABLED'
+        col.prop(mesh, "use_mirror_x")
 
-            col.label("Edge Select Mode")
-            col.prop(ts, "edge_path_mode", text="")
-            col.prop(context.tool_settings, "edge_path_live_unwrap")
+        row = col.row()
+        row.active = ob.data.use_mirror_x
+        row.prop(mesh, "use_mirror_topology")
 
+        col = layout.column(align=True)
+        col.label("Edge Select Mode:")
+        col.prop(tool_settings, "edge_path_mode", text="")
+        col.prop(tool_settings, "edge_path_live_unwrap")
+
 # ********** default tools for editmode_curve ****************
 
 

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h	2011-11-05 11:11:06 UTC (rev 41554)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list