Cycles: svn merge -r41205:41225 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 20:19:04 +0000 (20:19 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 20:19:04 +0000 (20:19 +0000)
39 files changed:
CMakeLists.txt
intern/ffmpeg/ffmpeg_compat.h
release/scripts/modules/bpy_types.py
release/scripts/modules/console_python.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/templates/driver_functions.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/brush.c
source/blender/blenlib/BLI_string_utf8.h
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/string_utf8.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poseUtils.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_preview.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_wm.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/rayshade.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/Physics/common/PHY_IMotionState.h

index be8109a18f03f2bfc23baf65dcf8557d55089886..b7e1a52a9c6ff0c5e4684c2617c58ed629b20dd6 100644 (file)
@@ -223,9 +223,6 @@ mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
-option(WITH_PYTHON_UI_INFO "Allow navigating to UI source from the context menu" OFF)
-mark_as_advanced(WITH_PYTHON_UI_INFO)
-
 
 if(APPLE)
        if(NOT CMAKE_OSX_ARCHITECTURES)
@@ -1456,10 +1453,6 @@ if(WITH_ASSERT_ABORT)
        add_definitions(-DWITH_ASSERT_ABORT)
 endif()
 
-if(WITH_PYTHON_UI_INFO)
-       add_definitions(-DWITH_PYTHON_UI_INFO)
-endif()
-
 # message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}")
 # message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}")
 
index a23dd22f932331e17af05ae16c264c1b5363211e..05299525d67c564f1f16eb144c3846f3269bb1a4 100644 (file)
@@ -29,7 +29,7 @@
 
 /* check our ffmpeg is new enough, avoids user complaints */
 #if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64))
-#  error "FFmpeg 0.7 or newer is needed, Upgrade you're FFmpeg or disable it"
+#  error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it"
 #endif
 /* end sanity check */
 
index cee0712e814576de36892fb9d58c1df20cf3373f..088e239e9a54d097a7cad66477eebf2a520be085 100644 (file)
@@ -16,7 +16,7 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
+# <pep8-80 compliant>
 
 from _bpy import types as bpy_types
 import _bpy
@@ -34,7 +34,8 @@ class Context(StructRNA):
     def copy(self):
         from types import BuiltinMethodType
         new_context = {}
-        generic_attrs = list(StructRNA.__dict__.keys()) + ["bl_rna", "rna_type", "copy"]
+        generic_attrs = (list(StructRNA.__dict__.keys()) +
+                         ["bl_rna", "rna_type", "copy"])
         for attr in dir(self):
             if not (attr.startswith("_") or attr in generic_attrs):
                 value = getattr(self, attr)
@@ -52,14 +53,19 @@ class Library(bpy_types.ID):
         """ID data blocks which use this library"""
         import bpy
 
-        # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE, we could make this an attribute in rna.
-        attr_links = "actions", "armatures", "brushes", "cameras", \
-                "curves", "grease_pencil", "groups", "images", \
-                "lamps", "lattices", "materials", "metaballs", \
-                "meshes", "node_groups", "objects", "scenes", \
-                "sounds", "speakers", "textures", "texts", "fonts", "worlds"
+        # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE,
+        # we could make this an attribute in rna.
+        attr_links = ("actions", "armatures", "brushes", "cameras",
+                      "curves", "grease_pencil", "groups", "images",
+                      "lamps", "lattices", "materials", "metaballs",
+                      "meshes", "node_groups", "objects", "scenes",
+                      "sounds", "speakers", "textures", "texts",
+                      "fonts", "worlds")
 
-        return tuple(id_block for attr in attr_links for id_block in getattr(bpy.data, attr) if id_block.library == self)
+        return tuple(id_block
+                     for attr in attr_links
+                     for id_block in getattr(bpy.data, attr)
+                     if id_block.library == self)
 
 
 class Texture(bpy_types.ID):
@@ -69,13 +75,21 @@ class Texture(bpy_types.ID):
     def users_material(self):
         """Materials that use this texture"""
         import bpy
-        return tuple(mat for mat in bpy.data.materials if self in [slot.texture for slot in mat.texture_slots if slot])
+        return tuple(mat for mat in bpy.data.materials
+                     if self in [slot.texture
+                                 for slot in mat.texture_slots
+                                 if slot]
+                     )
 
     @property
     def users_object_modifier(self):
         """Object modifiers that use this texture"""
         import bpy
-        return tuple(obj for obj in bpy.data.objects if self in [mod.texture for mod in obj.modifiers if mod.type == 'DISPLACE'])
+        return tuple(obj for obj in bpy.data.objects if
+                     self in [mod.texture
+                              for mod in obj.modifiers
+                              if mod.type == 'DISPLACE']
+                     )
 
 
 class Group(bpy_types.ID):
@@ -85,7 +99,8 @@ class Group(bpy_types.ID):
     def users_dupli_group(self):
         """The dupli group this group is used in"""
         import bpy
-        return tuple(obj for obj in bpy.data.objects if self == obj.dupli_group)
+        return tuple(obj for obj in bpy.data.objects
+                     if self == obj.dupli_group)
 
 
 class Object(bpy_types.ID):
@@ -95,19 +110,22 @@ class Object(bpy_types.ID):
     def children(self):
         """All the children of this object"""
         import bpy
-        return tuple(child for child in bpy.data.objects if child.parent == self)
+        return tuple(child for child in bpy.data.objects
+                     if child.parent == self)
 
     @property
     def users_group(self):
         """The groups this object is in"""
         import bpy
-        return tuple(group for group in bpy.data.groups if self in group.objects[:])
+        return tuple(group for group in bpy.data.groups
+                     if self in group.objects[:])
 
     @property
     def users_scene(self):
         """The scenes this object is in"""
         import bpy
-        return tuple(scene for scene in bpy.data.scenes if self in scene.objects[:])
+        return tuple(scene for scene in bpy.data.scenes
+                     if self in scene.objects[:])
 
 
 class _GenericBone:
@@ -118,13 +136,14 @@ class _GenericBone:
     __slots__ = ()
 
     def translate(self, vec):
-        """Utility function to add *vec* to the head and tail of this bone."""
+        """Utility function to add *vec* to the head and tail of this bone"""
         self.head += vec
         self.tail += vec
 
     def parent_index(self, parent_test):
         """
-        The same as 'bone in other_bone.parent_recursive' but saved generating a list.
+        The same as 'bone in other_bone.parent_recursive'
+        but saved generating a list.
         """
         # use the name so different types can be tested.
         name = parent_test.name
@@ -187,7 +206,9 @@ class _GenericBone:
 
     @property
     def length(self):
-        """The distance from head to tail, when set the head is moved to fit the length."""
+        """ The distance from head to tail,
+            when set the head is moved to fit the length.
+        """
         return self.vector.length
 
     @length.setter
@@ -196,7 +217,9 @@ class _GenericBone:
 
     @property
     def vector(self):
-        """The direction this bone is pointing. Utility function for (tail - head)"""
+        """ The direction this bone is pointing.
+            Utility function for (tail - head)
+        """
         return (self.tail - self.head)
 
     @property
@@ -222,7 +245,8 @@ class _GenericBone:
         """
         Returns a chain of children with the same base name as this bone.
         Only direct chains are supported, forks caused by multiple children
-        with matching base names will terminate the function and not be returned.
+        with matching base names will terminate the function
+        and not be returned.
         """
         basename = self.basename
         chain = []
@@ -241,7 +265,9 @@ class _GenericBone:
                 chain.append(child)
             else:
                 if len(children_basename):
-                    print("multiple basenames found, this is probably not what you want!", self.name, children_basename)
+                    print("multiple basenames found, "
+                          "this is probably not what you want!",
+                          self.name, children_basename)
 
                 break
 
@@ -284,13 +310,18 @@ class EditBone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
 
     def transform(self, matrix, scale=True, roll=True):
         """
-        Transform the the bones head, tail, roll and envelope (when the matrix has a scale component).
+        Transform the the bones head, tail, roll and envelope
+        (when the matrix has a scale component).
 
         :arg matrix: 3x3 or 4x4 transformation matrix.
         :type matrix: :class:`mathutils.Matrix`
         :arg scale: Scale the bone envelope by the matrix.
         :type scale: bool
-        :arg roll: Correct the roll to point in the same relative direction to the head and tail.
+        :arg roll:
+
+           Correct the roll to point in the same relative
+           direction to the head and tail.
+
         :type roll: bool
         """
         from mathutils import Vector
@@ -321,11 +352,23 @@ class Mesh(bpy_types.ID):
         Make a mesh from a list of vertices/edges/faces
         Until we have a nicer way to make geometry, use this.
 
-        :arg vertices: float triplets each representing (X, Y, Z) eg: [(0.0, 1.0, 0.5), ...].
+        :arg vertices:
+
+           float triplets each representing (X, Y, Z)
+           eg: [(0.0, 1.0, 0.5), ...].
+
         :type vertices: iterable object
-        :arg edges: int pairs, each pair contains two indices to the *vertices* argument. eg: [(1, 2), ...]
+        :arg edges:
+
+           int pairs, each pair contains two indices to the
+           *vertices* argument. eg: [(1, 2), ...]
+
         :type edges: iterable object
-        :arg faces: iterator of faces, each faces contains three or four indices to the *vertices* argument. eg: [(5, 6, 8, 9), (1, 2, 3), ...]
+        :arg faces:
+
+           iterator of faces, each faces contains three or four indices to
+           the *vertices* argument. eg: [(5, 6, 8, 9), (1, 2, 3), ...]
+
         :type faces: iterable object
         """
         self.vertices.add(len(vertices))
@@ -419,7 +462,10 @@ class Text(bpy_types.ID):
     def users_logic(self):
         """Logic bricks that use this text"""
         import bpy
-        return tuple(obj for obj in bpy.data.objects if self in [cont.text for cont in obj.game.controllers if cont.type == 'PYTHON'])
+        return tuple(obj for obj in bpy.data.objects
+                     if self in [cont.text for cont in obj.game.controllers
+                                 if cont.type == 'PYTHON']
+                     )
 
 # values are module: [(cls, path, line), ...]
 TypeMap = {}
@@ -510,10 +556,11 @@ class Operator(StructRNA, metaclass=OrderedMeta):
         return super().__delattr__(attr)
 
     def as_keywords(self, ignore=()):
-        """ Return a copy of the properties as a dictionary.
-        """
+        """Return a copy of the properties as a dictionary"""
         ignore = ignore + ("rna_type",)
-        return {attr: getattr(self, attr) for attr in self.properties.rna_type.properties.keys() if attr not in ignore}
+        return {attr: getattr(self, attr)
+                for attr in self.properties.rna_type.properties.keys()
+                if attr not in ignore}
 
 
 class Macro(StructRNA, metaclass=OrderedMeta):
@@ -553,7 +600,8 @@ class _GenericUI:
                 operator_context_default = self.layout.operator_context
 
                 for func in draw_ls._draw_funcs:
-                    # so bad menu functions don't stop the entire menu from drawing
+                    # so bad menu functions don't stop
+                    # the entire menu from drawing
                     try:
                         func(self, context)
                     except:
@@ -569,13 +617,19 @@ class _GenericUI:
 
     @classmethod
     def append(cls, draw_func):
-        """Append a draw function to this menu, takes the same arguments as the menus draw function."""
+        """
+        Append a draw function to this menu,
+        takes the same arguments as the menus draw function
+        """
         draw_funcs = cls._dyn_ui_initialize()
         draw_funcs.append(draw_func)
 
     @classmethod
     def prepend(cls, draw_func):
-        """Prepend a draw function to this menu, takes the same arguments as the menus draw function."""
+        """
+        Prepend a draw function to this menu, takes the same arguments as
+        the menus draw function
+        """
         draw_funcs = cls._dyn_ui_initialize()
         draw_funcs.insert(0, draw_func)
 
@@ -615,7 +669,8 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta):
         # collect paths
         files = []
         for directory in searchpaths:
-            files.extend([(f, os.path.join(directory, f)) for f in os.listdir(directory)])
+            files.extend([(f, os.path.join(directory, f))
+                           for f in os.listdir(directory)])
 
         files.sort()
 
@@ -635,9 +690,11 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta):
                 props.menu_idname = self.bl_idname
 
     def draw_preset(self, context):
-        """Define these on the subclass
-         - preset_operator
-         - preset_subdir
+        """
+        Define these on the subclass
+        - preset_operator
+        - preset_subdir
         """
         import bpy
-        self.path_menu(bpy.utils.preset_paths(self.preset_subdir), self.preset_operator)
+        self.path_menu(bpy.utils.preset_paths(self.preset_subdir),
+                       self.preset_operator)
index f11ccf84f0b2cc40664a8284c2af63eb52699de5..6c49283b3e1a6dfba68f1103954864ba8a80b9e1 100644 (file)
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
+# <pep8-80 compliant>
 import sys
 import bpy
 
-language_id = 'python'
+language_id = "python"
 
 # store our own __main__ module, not 100% needed
 # but python expects this in some places
@@ -28,8 +28,8 @@ _BPY_MAIN_OWN = True
 
 
 def add_scrollback(text, text_type):
-    for l in text.split('\n'):
-        bpy.ops.console.scrollback_append(text=l.replace('\t', '    '),
+    for l in text.split("\n"):
+        bpy.ops.console.scrollback_append(text=l.replace("\t", "    "),
             type=text_type)
 
 
@@ -81,7 +81,8 @@ def get_console(console_id):
         console, stdout, stderr = console_data
 
         # XXX, bug in python 3.1.2, 3.2 ? (worked in 3.1.1)
-        # seems there is no way to clear StringIO objects for writing, have to make new ones each time.
+        # seems there is no way to clear StringIO objects for writing, have to
+        # make new ones each time.
         import io
         stdout = io.StringIO()
         stderr = io.StringIO()
@@ -99,7 +100,8 @@ def get_console(console_id):
 
         replace_help(namespace)
 
-        console = InteractiveConsole(locals=namespace, filename="<blender_console>")
+        console = InteractiveConsole(locals=namespace,
+                                     filename="<blender_console>")
 
         console.push("from mathutils import *")
         console.push("from math import *")
@@ -265,7 +267,8 @@ def autocomplete(context):
 
     # Separate autocomplete output by command prompts
     if scrollback != '':
-        bpy.ops.console.scrollback_append(text=sc.prompt + current_line.body, type='INPUT')
+        bpy.ops.console.scrollback_append(text=sc.prompt + current_line.body,
+                                          type='INPUT')
 
     # Now we need to copy back the line from blender back into the
     # text editor. This will change when we don't use the text editor
@@ -296,10 +299,15 @@ def banner(context):
     add_scrollback("Execute:             Enter", 'OUTPUT')
     add_scrollback("Autocomplete:        Ctrl+Space", 'OUTPUT')
     add_scrollback("Ctrl +/-  Wheel:     Zoom", 'OUTPUT')
-    add_scrollback("Builtin Modules:     bpy, bpy.data, bpy.ops, bpy.props, bpy.types, bpy.context, bpy.utils, bgl, blf, mathutils", 'OUTPUT')
-    add_scrollback("Convenience Imports: from mathutils import *; from math import *", 'OUTPUT')
+    add_scrollback("Builtin Modules:     bpy, bpy.data, bpy.ops, "
+                   "bpy.props, bpy.types, bpy.context, bpy.utils, "
+                   "bgl, blf, mathutils",
+                   'OUTPUT')
+    add_scrollback("Convenience Imports: from mathutils import *; "
+                   "from math import *", 'OUTPUT')
     add_scrollback("", 'OUTPUT')
-    # add_scrollback("  WARNING!!! Blender 2.5 API is subject to change, see API reference for more info", 'ERROR')
+    # add_scrollback("  WARNING!!! Blender 2.5 API is subject to change, "
+    #                "see API reference for more info", 'ERROR')
     # add_scrollback("", 'OUTPUT')
     sc.prompt = PROMPT
 
index ff19ece8f94a773a9047c931e0c889e09d0bf2e9..425b7a601c8190bf02876e8d22612d6ebb48b299 100644 (file)
@@ -51,8 +51,7 @@ class MESH_MT_shape_key_specials(Menu):
         layout.operator("object.shape_key_transfer", icon='COPY_ID')  # icon is not ideal
         layout.operator("object.join_shapes", icon='COPY_ID')  # icon is not ideal
         layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT')
-        op = layout.operator("object.shape_key_add", icon='ZOOMIN', text="New Shape From Mix")
-        op.from_mix = True
+        layout.operator("object.shape_key_add", icon='ZOOMIN', text="New Shape From Mix").from_mix = True
 
 
 class MeshButtonsPanel():
@@ -207,8 +206,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
         col = row.column()
 
         sub = col.column(align=True)
-        op = sub.operator("object.shape_key_add", icon='ZOOMIN', text="")
-        op.from_mix = False
+        sub.operator("object.shape_key_add", icon='ZOOMIN', text="").from_mix = False
         sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="")
         sub.menu("MESH_MT_shape_key_specials", icon='DOWNARROW_HLT', text="")
 
index 167cead9a3bb5912ab76dab56d49bff7887e4967..d3859a78bea35c00ee4e291681f0b6927a051c75 100644 (file)
@@ -115,8 +115,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
 
             subcol = col.column()
             subcol.operator_context = 'INVOKE_DEFAULT'
-            op = subcol.operator("anim.keying_set_export", text="Export to File")
-            op.filepath = "keyingset.py"
+            subcol.operator("anim.keying_set_export", text="Export to File").filepath = "keyingset.py"
 
             col = row.column()
             col.label(text="Keyframing Settings:")
index 051854a28f1f8c4dc33df5be15634740c3f3cbd9..50db989a2e20fd6f9a0d538b7a9e52f96c8291d7 100644 (file)
@@ -157,24 +157,24 @@ class IMAGE_MT_image_invert(Menu):
     def draw(self, context):
         layout = self.layout
 
-        op = layout.operator("image.invert", text="Invert Image Colors")
-        op.invert_r = True
-        op.invert_g = True
-        op.invert_b = True
+        props = layout.operator("image.invert", text="Invert Image Colors")
+        props.invert_r = True
+        props.invert_g = True
+        props.invert_b = True
 
         layout.separator()
 
-        op = layout.operator("image.invert", text="Invert Red Channel")
-        op.invert_r = True
+        props = layout.operator("image.invert", text="Invert Red Channel")
+        props.invert_r = True
 
-        op = layout.operator("image.invert", text="Invert Green Channel")
-        op.invert_g = True
+        props = layout.operator("image.invert", text="Invert Green Channel")
+        props.invert_g = True
 
-        op = layout.operator("image.invert", text="Invert Blue Channel")
-        op.invert_b = True
+        props = layout.operator("image.invert", text="Invert Blue Channel")
+        props.invert_b = True
 
-        op = layout.operator("image.invert", text="Invert Alpha Channel")
-        op.invert_a = True
+        props = layout.operator("image.invert", text="Invert Alpha Channel")
+        props.invert_a = True
 
 
 class IMAGE_MT_uvs_showhide(Menu):
index 2c537efa61bbc4660012c2e557cdd481678be4b6..5e5ce462da9cfcbafa0cef062cc1abda58e6330b 100644 (file)
@@ -164,11 +164,9 @@ class InputKeyMapPanel:
             row.label()
 
         if (not kmi.is_user_defined) and kmi.is_user_modified:
-            op = row.operator("wm.keyitem_restore", text="", icon='BACK')
-            op.item_id = kmi.id
+            row.operator("wm.keyitem_restore", text="", icon='BACK').item_id = kmi.id
         else:
-            op = row.operator("wm.keyitem_remove", text="", icon='X')
-            op.item_id = kmi.id
+            row.operator("wm.keyitem_remove", text="", icon='X').item_id = kmi.id
 
         # Expanded, additional event settings
         if kmi.show_expanded:
index 8687517bd14cad52308c6b3a239e3fb634f2d5e8..bd5750a3a207eff3817cde7726764d1cd624a7c9 100644 (file)
@@ -54,11 +54,10 @@ class VIEW3D_HT_header(Header):
             else:
                 sub.menu("VIEW3D_MT_object")
 
-        
         # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode...
-        row = layout.row() #XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo 
+        row = layout.row()  # XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo
         row.template_header_3D()
-        
+
         if obj:
             # Particle edit
             if obj.mode == 'PARTICLE_EDIT':
index db9d4fb4678ecbb690deb214fe46e62301b6d84a..1c6af0e574ffff717223abc2b036af99554ee7ba 100644 (file)
@@ -16,6 +16,7 @@ def invert(f):
 
 uuid_store = {}
 
+
 def slow_value(value, fac, uuid):
     """ Delay the value by a factor, use a unique string to allow
         use in multiple drivers without conflict:
index 0cad398995ab542ade8356ca10f16f9d568b82a6..f5684810e149f48443dc1210e02c58341a6d3f64 100644 (file)
@@ -51,7 +51,7 @@ extern "C" {
 
 /* used by packaging tools */
                /* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR   a
                /* alpha/beta/rc/release, docs use this */
 #define BLENDER_VERSION_CYCLE  alpha
 
index c84a3cfc73026f118aa5de182e4e55d6bf879d4e..4ab9d085de3157d13dc571f25ca54dc0e22ea0e3 100644 (file)
@@ -930,7 +930,7 @@ void brush_jitter_pos(Brush *brush, float pos[2], float jitterpos[2])
 {
        int use_jitter= brush->jitter != 0;
 
-       /* jitter-ed brush gives wierd and unpredictable result for this
+       /* jitter-ed brush gives weird and unpredictable result for this
           kinds of stroke, so manyally disable jitter usage (sergey) */
        use_jitter&= (brush->flag & (BRUSH_RESTORE_MESH|BRUSH_ANCHORED)) == 0;
 
index 765ae93828eb7fa7f86d650dd6d18e6e70d25ffc..bcb641d79d820fb7115aec7812cfffebccab1d5c 100644 (file)
@@ -37,6 +37,7 @@ char        *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy);
 int          BLI_utf8_invalid_byte(const char *str, int length);
 int          BLI_utf8_invalid_strip(char *str, int length);
 
+int          BLI_str_utf8_size(const char *p); /* warning, can return -1 on bad chars */
     /* copied from glib */
 unsigned int BLI_str_utf8_as_unicode(const char *p);
 unsigned int BLI_str_utf8_as_unicode_and_size(const char *p, size_t *index);
index d9176c5f16278fc18bafd9a515027c68cc01615c..d28c1e298204fe8489fdcc3c4d12c6e803134119 100644 (file)
@@ -1257,9 +1257,18 @@ void BLI_make_file_string(const char *relabase, char *string,  const char *dir,
 {
        int sl;
 
-       if (!string || !dir || !file) return; /* We don't want any NULLs */
-       
-       string[0]= 0; /* ton */
+       if (string) {
+               /* ensure this is always set even if dir/file are NULL */
+               string[0]= '\0';
+
+               if (ELEM(NULL, dir, file)) {
+                       return; /* We don't want any NULLs */
+               }
+       }
+       else {
+               return; /* string is NULL, probably shouldnt happen but return anyway */
+       }
+
 
        /* we first push all slashes into unix mode, just to make sure we don't get
           any mess with slashes later on. -jesterKing */
index b1ad04eb70d9f66e7455a2c447d6959c051c0794..b4c58d3bab48110a09f85fbcd5b570ed11a0acb4 100644 (file)
@@ -312,6 +312,18 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size
        }
 
 
+/* uses glib functions but not from glib */
+/* gets the size of a single utf8 char */
+int BLI_str_utf8_size(const char *p)
+{
+       int mask = 0, len;
+    unsigned char c = (unsigned char) *p;
+
+    UTF8_COMPUTE (c, mask, len);
+
+       return len;
+}
+
 /* was g_utf8_get_char */
 /**
  * BLI_str_utf8_as_unicode:
index 10cc5e85f9dd98ac9aa619a8f7d206847c6ca23d..07ece571255d3532648a2b6e75e0cc01517a196a 100644 (file)
@@ -2711,7 +2711,6 @@ int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportL
                }
        }
 
-       userfilename[0]= '\0'; /* ensure its initialized */
        BLI_make_file_string(G.main->name, userfilename, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_STARTUP_FILE);
        write_user_block= (BLI_path_cmp(filepath, userfilename) == 0);
 
index 7c2f969e1873028f309f07a50808d91c12a2f6f8..95324554a069c2c022f3815c276e880f778319fd 100644 (file)
@@ -552,7 +552,12 @@ KeyingSet *ANIM_builtin_keyingset_get_named (KeyingSet *prevKS, const char name[
                if (strcmp(name, ks->name) == 0)
                        return ks;
        }
-       
+
+       /* complain about missing keying sets on debug builds */
+#ifndef NDEBUG
+       printf("%s: '%s' not found\n", __func__, name);
+#endif
+
        /* no matches found */
        return NULL;
 }
@@ -687,7 +692,7 @@ KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformK
        if (IS_AUTOKEY_FLAG(scene, ONLYKEYINGSET) && (scene->active_keyingset))
                return ANIM_scene_get_active_keyingset(scene);
        else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL))
-               return ANIM_builtin_keyingset_get_named(NULL, "Available");
+               return ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_AVAILABLE_ID);
        else 
                return ANIM_builtin_keyingset_get_named(NULL, tranformKSName);
 }
index 11fd932eed6a0e98deb7fec33db2ebb688e90f4e..15c8868f9b9b97b93fb430b8e9a701f3cdc9e6f3 100644 (file)
@@ -4948,7 +4948,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
 
 static int pose_clear_scale_exec(bContext *C, wmOperator *op) 
 {
-       return pose_clear_transform_generic_exec(C, op, pchan_clear_scale, "Scaling");
+       return pose_clear_transform_generic_exec(C, op, pchan_clear_scale, ANIM_KS_SCALING_ID);
 }
 
 void POSE_OT_scale_clear(wmOperatorType *ot)
@@ -4969,7 +4969,7 @@ void POSE_OT_scale_clear(wmOperatorType *ot)
 
 static int pose_clear_rot_exec(bContext *C, wmOperator *op) 
 {
-       return pose_clear_transform_generic_exec(C, op, pchan_clear_rot, "Rotation");
+       return pose_clear_transform_generic_exec(C, op, pchan_clear_rot, ANIM_KS_ROTATION_ID);
 }
 
 void POSE_OT_rot_clear(wmOperatorType *ot)
@@ -4990,7 +4990,7 @@ void POSE_OT_rot_clear(wmOperatorType *ot)
 
 static int pose_clear_loc_exec(bContext *C, wmOperator *op) 
 {
-       return pose_clear_transform_generic_exec(C, op, pchan_clear_loc, "Location");
+       return pose_clear_transform_generic_exec(C, op, pchan_clear_loc, ANIM_KS_LOCATION_ID);
 }
 
 void POSE_OT_loc_clear(wmOperatorType *ot)
@@ -5011,7 +5011,7 @@ void POSE_OT_loc_clear(wmOperatorType *ot)
 
 static int pose_clear_transforms_exec(bContext *C, wmOperator *op) 
 {
-       return pose_clear_transform_generic_exec(C, op, pchan_clear_transforms, "LocRotScale");
+       return pose_clear_transform_generic_exec(C, op, pchan_clear_transforms, ANIM_KS_LOC_ROT_SCALE_ID);
 }
 
 void POSE_OT_transforms_clear(wmOperatorType *ot)
index 4b22d76ad0b9e3b8c31bc9928bc8374a7bbbe3c5..5c98fdc08bd155d5f821a5101f5d206bcce4a781 100644 (file)
@@ -223,7 +223,7 @@ void poseAnim_mapping_autoKeyframe (bContext *C, Scene *scene, Object *ob, ListB
 {
        /* insert keyframes as necessary if autokeyframing */
        if (autokeyframe_cfra_can_key(scene, &ob->id)) {
-               KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Whole Character");
+               KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_WHOLE_CHARACTER_ID);
                ListBase dsources = {NULL, NULL};
                tPChanFCurveLink *pfl;
                
index 8e9f5c7543c08aeaf58a043aad294551b8aa5daf..064defb1aefe2cb0b4c7a8bc43f0d2a14a64b2f5 100644 (file)
@@ -433,7 +433,7 @@ static int poselib_add_exec (bContext *C, wmOperator *op)
        bAction *act = poselib_validate(ob);
        bPose *pose= (ob) ? ob->pose : NULL;
        TimeMarker *marker;
-       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Whole Character"); /* this includes custom props :)*/
+       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_ID); /* this includes custom props :)*/
        int frame= RNA_int_get(op->ptr, "frame");
        char name[64];
        
@@ -903,7 +903,7 @@ static void poselib_keytag_pose (bContext *C, Scene *scene, tPoseLib_PreviewData
        bAction *act= pld->act;
        bActionGroup *agrp;
        
-       KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Whole Character");
+       KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_WHOLE_CHARACTER_ID);
        ListBase dsources = {NULL, NULL};
        short autokey = autokeyframe_cfra_can_key(scene, &pld->ob->id);
        
index a978f327993c8457c6b0b8bd0b2c91b13e3e37ac..beae9c12bfe7b589734d0b05411964f3ddc3ad5d 100644 (file)
@@ -1151,7 +1151,7 @@ static int pose_paste_exec (bContext *C, wmOperator *op)
        int selOnly= RNA_boolean_get(op->ptr, "selected_mask");
 
        /* get KeyingSet to use */
-       KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "LocRotScale");
+       KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOC_ROT_SCALE_ID);
 
        /* sanity checks */
        if ELEM(NULL, ob, ob->pose)
@@ -2165,7 +2165,7 @@ static int pose_flip_quats_exec (bContext *C, wmOperator *UNUSED(op))
 {
        Scene *scene= CTX_data_scene(C);
        Object *ob= object_pose_armature_get(CTX_data_active_object(C));
-       KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+       KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
        
        /* loop through all selected pchans, flipping and keying (as needed) */
        CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pose_bones)
index 8dd543d8f63a7126d49935a6e85074d064b5dd9b..eda84d0e7a452379cf118eef6b8bd0bbd902f008 100644 (file)
@@ -317,6 +317,14 @@ typedef enum eAnimFilterFlags {
 int ED_autokeyframe_object(struct bContext *C, struct Scene *scene, struct Object *ob, struct KeyingSet *ks);
 int ED_autokeyframe_pchan(struct bContext *C, struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, struct KeyingSet *ks);
 
+/* Names for builtin keying sets so we don't confuse these with labels/text,
+ * defined in python script: keyingsets_builtins.py */
+#define ANIM_KS_LOCATION_ID         "Location"
+#define ANIM_KS_ROTATION_ID         "Rotation"
+#define ANIM_KS_SCALING_ID          "Scaling"
+#define ANIM_KS_LOC_ROT_SCALE_ID    "LocRotScale"
+#define ANIM_KS_AVAILABLE_ID        "Available"
+#define ANIM_KS_WHOLE_CHARACTER_ID  "Whole Character"
 
 #ifdef __cplusplus
 }
index c0fa8b7bebd2b15ef1f1f4f5fbe3d7532873d355..39847418ca6298abd2060ef9a74db1039cbfbf99 100644 (file)
@@ -797,6 +797,7 @@ void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propn
 void UI_buttons_operatortypes(void);
 
 /* Helpers for Operators */
+uiBut *uiContextActiveButton(const struct bContext *C);
 void uiContextActiveProperty(const struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA **prop, int *index);
 void uiContextActivePropertyHandle(struct bContext *C);
 void uiContextAnimUpdate(const struct bContext *C);
@@ -827,5 +828,9 @@ const char *UI_translate_do_tooltip(const char *msgid);
 #define IFACE_(msgid) UI_translate_do_iface(msgid)
 #define TIP_(msgid) UI_translate_do_tooltip(msgid)
 
+/* UI_OT_editsource helpers */
+int  UI_editsource_enable_check(void);
+void UI_editsource_active_but_test(uiBut *but);
+
 #endif /*  UI_INTERFACE_H */
 
index b7b572e72170af4e560f71a525f8031e659ab8f3..f999107950704f551b2e5b8ee18921dda48192f3 100644 (file)
@@ -2562,23 +2562,10 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
        if(block->curlayout)
                ui_layout_add_but(block->curlayout, but);
 
-#ifdef WITH_PYTHON_UI_INFO
-       {
-               extern void PyC_FileAndNum_Safe(const char **filename, int *lineno);
-
-               const char *fn;
-               int lineno= -1;
-               PyC_FileAndNum_Safe(&fn, &lineno);
-               if (lineno != -1) {
-                       BLI_strncpy(but->py_dbg_fn, fn, sizeof(but->py_dbg_fn));
-                       but->py_dbg_ln= lineno;
-               }
-               else {
-                       but->py_dbg_fn[0]= '\0';
-                       but->py_dbg_ln= -1;
-               }
+       /* if the 'UI_OT_editsource' is running, extract the source info from the button  */
+       if (UI_editsource_enable_check()) {
+               UI_editsource_active_but_test(but);
        }
-#endif /* WITH_PYTHON_UI_INFO */
 
        return but;
 }
index 32c4ec21e13b177b027761719a381ab40705dce8..9f77317292c5167c46284b27a4b595a25b483505 100644 (file)
@@ -1447,7 +1447,7 @@ static int ui_textedit_type_utf8(uiBut *but, uiHandleButtonData *data, const cha
        len= strlen(str);
 
        if(len-(but->selend - but->selsta)+1 <= data->maxlen) {
-               int step= BLI_strnlen(utf8_buf, sizeof(utf8_buf));
+               int step= BLI_str_utf8_size(utf8_buf);
 
                /* type over the current selection */
                if ((but->selend - but->selsta) > 0) {
@@ -4443,16 +4443,8 @@ static int ui_but_menu(bContext *C, uiBut *but)
                }
        }
 
-#ifdef WITH_PYTHON_UI_INFO
-       if (but->py_dbg_ln != -1) {
-               PointerRNA ptr_props;
-
-               WM_operator_properties_create(&ptr_props, "WM_OT_text_edit");
-               RNA_string_set(&ptr_props, "filepath", but->py_dbg_fn);
-               RNA_int_set(&ptr_props, "line", but->py_dbg_ln);
-               uiItemFullO(layout, "WM_OT_text_edit", "Edit Source", ICON_NONE, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
-       }
-#endif /* WITH_PYTHON_UI_INFO */
+       /* perhaps we should move this into (G.f & G_DEBUG) - campbell */
+       uiItemFullO(layout, "UI_OT_editsource", "Edit Source", ICON_NONE, NULL, WM_OP_INVOKE_DEFAULT, 0);
 
        uiPupMenuEnd(C, pup);
 
@@ -5146,9 +5138,10 @@ void ui_button_active_free(const bContext *C, uiBut *but)
        }
 }
 
-static uiBut *ui_context_rna_button_active(const bContext *C)
+/* returns the active button with an optional checking function */
+static uiBut *ui_context_button_active(const bContext *C, int (*but_check_cb)(uiBut *))
 {
-       uiBut *rnabut= NULL;
+       uiBut *but_found= NULL;
 
        ARegion *ar= CTX_wm_region(C);
 
@@ -5166,26 +5159,40 @@ static uiBut *ui_context_rna_button_active(const bContext *C)
                        }
                }
 
-               if(activebut && activebut->rnapoin.data) {
+               if(activebut && (but_check_cb == NULL || but_check_cb(activebut))) {
                        uiHandleButtonData *data= activebut->active;
 
-                       rnabut= activebut;
+                       but_found= activebut;
 
                        /* recurse into opened menu, like colorpicker case */
                        if(data && data->menu && (ar != data->menu->region)) {
                                ar = data->menu->region;
                        }
                        else {
-                               return rnabut;
+                               return but_found;
                        }
                }
                else {
                        /* no active button */
-                       return rnabut;
+                       return but_found;
                }
        }
 
-       return rnabut;
+       return but_found;
+}
+
+static int ui_context_rna_button_active_test(uiBut *but)
+{
+       return (but->rnapoin.data != NULL);
+}
+static uiBut *ui_context_rna_button_active(const bContext *C)
+{
+       return ui_context_button_active(C, ui_context_rna_button_active_test);
+}
+
+uiBut *uiContextActiveButton(const struct bContext *C)
+{
+       return ui_context_button_active(C, NULL);
 }
 
 /* helper function for insert keyframe, reset to default, etc operators */
index b3e7417b438fabf093bc6d75c9589c6aff008f37..a85a267d79569d4ed5f9f33df78769bd16c212be 100644 (file)
@@ -253,11 +253,6 @@ struct uiBut {
        
                /* pointer back */
        uiBlock *block;
-
-#ifdef WITH_PYTHON_UI_INFO
-       char py_dbg_fn[240];
-       int py_dbg_ln;
-#endif
 };
 
 struct uiBlock {
index 081b528d153e90fc79eccba4d37534a782331cad..eee771cbd9357b706d3fafcb03cc8d9e48a9cd4c 100644 (file)
 #include "WM_api.h"
 #include "WM_types.h"
 
+/* only for UI_OT_editsource */
+#include "ED_screen.h"
+#include "BKE_main.h"
+#include "BLI_ghash.h"
 
 
 /* ********************************************************** */
@@ -474,6 +478,242 @@ static void UI_OT_reports_to_textblock(wmOperatorType *ot)
        ot->exec= reports_to_text_exec;
 }
 
+
+/* ------------------------------------------------------------------------- */
+/* EditSource Utility funcs and operator,
+ * note, this includes itility functions and button matching checks */
+
+struct uiEditSourceStore {
+       uiBut but_orig;
+       GHash *hash;
+} uiEditSourceStore;
+
+struct uiEditSourceButStore {
+       char py_dbg_fn[240];
+       int py_dbg_ln;
+} uiEditSourceButStore;
+
+/* should only ever be set while the edit source operator is running */
+struct uiEditSourceStore *ui_editsource_info= NULL;
+
+int  UI_editsource_enable_check(void)
+{
+       return (ui_editsource_info != NULL);
+}
+
+static void ui_editsource_active_but_set(uiBut *but)
+{
+       BLI_assert(ui_editsource_info == NULL);
+
+       ui_editsource_info= MEM_callocN(sizeof(uiEditSourceStore), __func__);
+       memcpy(&ui_editsource_info->but_orig, but, sizeof(uiBut));
+
+       ui_editsource_info->hash = BLI_ghash_new(BLI_ghashutil_ptrhash,
+                                                BLI_ghashutil_ptrcmp,
+                                                __func__);
+}
+
+static void ui_editsource_active_but_clear(void)
+{
+       BLI_ghash_free(ui_editsource_info->hash, NULL, (GHashValFreeFP)MEM_freeN);
+       MEM_freeN(ui_editsource_info);
+       ui_editsource_info= NULL;
+}
+
+static int ui_editsource_uibut_match(uiBut *but_a, uiBut *but_b)
+{
+#if 0
+       printf("matching buttons: '%s' == '%s'\n",
+              but_a->drawstr, but_b->drawstr);
+#endif
+
+       /* this just needs to be a 'good-enough' comparison so we can know beyond
+        * reasonable doubt that these buttons are the same between redraws.
+        * if this fails it only means edit-source fails - campbell */
+       if(     (but_a->x1 == but_b->x1) &&
+               (but_a->x2 == but_b->x2) &&
+               (but_a->y1 == but_b->y1) &&
+               (but_a->y2 == but_b->y2) &&
+               (but_a->type == but_b->type) &&
+               (but_a->rnaprop == but_b->rnaprop) &&
+               (but_a->optype == but_b->optype) &&
+               (but_a->unit_type == but_b->unit_type) &&
+               strncmp(but_a->drawstr, but_b->drawstr, UI_MAX_DRAW_STR) == 0
+       ) {
+               return TRUE;
+       }
+       else {
+               return FALSE;
+       }
+}
+
+void UI_editsource_active_but_test(uiBut *but)
+{
+       extern void PyC_FileAndNum_Safe(const char **filename, int *lineno);
+
+       struct uiEditSourceButStore *but_store= MEM_callocN(sizeof(uiEditSourceButStore), __func__);
+
+       const char *fn;
+       int lineno= -1;
+
+#if 0
+       printf("comparing buttons: '%s' == '%s'\n",
+              but->drawstr, ui_editsource_info->but_orig.drawstr);
+#endif
+
+       PyC_FileAndNum_Safe(&fn, &lineno);
+
+       if (lineno != -1) {
+               BLI_strncpy(but_store->py_dbg_fn, fn,
+                                       sizeof(but_store->py_dbg_fn));
+               but_store->py_dbg_ln= lineno;
+       }
+       else {
+               but_store->py_dbg_fn[0]= '\0';
+               but_store->py_dbg_ln= -1;
+       }
+
+       BLI_ghash_insert(ui_editsource_info->hash, but, but_store);
+}
+
+/* editsource operator component */
+
+static ScrArea *biggest_text_view(bContext *C)
+{
+       bScreen *sc= CTX_wm_screen(C);
+       ScrArea *sa, *big= NULL;
+       int size, maxsize= 0;
+
+       for(sa= sc->areabase.first; sa; sa= sa->next) {
+               if(sa->spacetype==SPACE_TEXT) {
+                       size= sa->winx * sa->winy;
+                       if(size > maxsize) {
+                               maxsize= size;
+                               big= sa;
+                       }
+               }
+       }
+       return big;
+}
+
+static int editsource_text_edit(bContext *C, wmOperator *op,
+                                char filepath[240], int line)
+{
+       struct Main *bmain= CTX_data_main(C);
+       Text *text;
+
+       for (text=bmain->text.first; text; text=text->id.next) {
+               if (text->name && BLI_path_cmp(text->name, filepath) == 0) {
+                       break;
+               }
+       }
+
+       if (text == NULL) {
+               text= add_text(filepath, bmain->name);
+       }
+
+       if (text == NULL) {
+               BKE_reportf(op->reports, RPT_WARNING,
+                           "file: '%s' can't be opened", filepath);
+               return OPERATOR_CANCELLED;
+       }
+       else {
+               /* naughty!, find text area to set, not good behavior
+                * but since this is a dev tool lets allow it - campbell */
+               ScrArea *sa= biggest_text_view(C);
+               if(sa) {
+                       SpaceText *st= sa->spacedata.first;
+                       st->text= text;
+               }
+               else {
+                       BKE_reportf(op->reports, RPT_INFO,
+                                   "See '%s' in the text editor", text->id.name + 2);
+               }
+
+               txt_move_toline(text, line - 1, FALSE);
+               WM_event_add_notifier(C, NC_TEXT|ND_CURSOR, text);
+       }
+
+       return OPERATOR_FINISHED;
+}
+
+static int editsource_exec(bContext *C, wmOperator *op)
+{
+       uiBut *but= uiContextActiveButton(C);
+
+       if (but) {
+               GHashIterator ghi;
+               struct uiEditSourceButStore *but_store= NULL;
+
+               ARegion *ar= CTX_wm_region(C);
+               int ret;
+
+               /* needed else the active button does not get tested */
+               uiFreeActiveButtons(C, CTX_wm_screen(C));
+
+               // printf("%s: begin\n", __func__);
+
+               /* take care not to return before calling ui_editsource_active_but_clear */
+               ui_editsource_active_but_set(but);
+
+               /* redraw and get active button python info */
+               ED_region_do_draw(C, ar);
+
+               for(BLI_ghashIterator_init(&ghi, ui_editsource_info->hash);
+                   !BLI_ghashIterator_isDone(&ghi);
+                   BLI_ghashIterator_step(&ghi))
+               {
+                       uiBut *but= BLI_ghashIterator_getKey(&ghi);
+                       if (but && ui_editsource_uibut_match(&ui_editsource_info->but_orig, but)) {
+                               but_store= BLI_ghashIterator_getValue(&ghi);
+                               break;
+                       }
+
+               }
+
+               if (but_store) {
+                       if (but_store->py_dbg_ln != -1) {
+                               ret= editsource_text_edit(C, op,
+                                                         but_store->py_dbg_fn,
+                                                         but_store->py_dbg_ln);
+                       }
+                       else {
+                               BKE_report(op->reports, RPT_ERROR,
+                                                  "Active button isn't from a script, cant edit source.");
+                               ret= OPERATOR_CANCELLED;
+                       }
+               }
+               else {
+                       BKE_report(op->reports, RPT_ERROR,
+                                          "Active button match can't be found.");
+                       ret= OPERATOR_CANCELLED;
+               }
+
+
+               ui_editsource_active_but_clear();
+
+               // printf("%s: end\n", __func__);
+
+               return ret;
+       }
+       else {
+               BKE_report(op->reports, RPT_ERROR, "Active button not found");
+               return OPERATOR_CANCELLED;
+       }
+}
+
+static void UI_OT_editsource(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Reports to Text Block";
+       ot->idname= "UI_OT_editsource";
+       ot->description= "Edit source code for a button";
+
+       /* callbacks */
+       ot->exec= editsource_exec;
+}
+
+
 /* ********************************************************* */
 /* Registration */
 
@@ -485,5 +725,6 @@ void UI_buttons_operatortypes(void)
        WM_operatortype_append(UI_OT_reset_default_button);
        WM_operatortype_append(UI_OT_copy_to_selected_button);
        WM_operatortype_append(UI_OT_reports_to_textblock); // XXX: temp?
+       WM_operatortype_append(UI_OT_editsource);
 }
 
index 4ca7d27250365bd6e12482e5f1c3e42dc6d5dd25..6d721e828afa35348d66a6e55ff3ff4458733558 100644 (file)
@@ -252,7 +252,7 @@ static int object_clear_transform_generic_exec(bContext *C, wmOperator *op,
 
 static int object_location_clear_exec(bContext *C, wmOperator *op)
 {
-       return object_clear_transform_generic_exec(C, op, object_clear_loc, "Location");
+       return object_clear_transform_generic_exec(C, op, object_clear_loc, ANIM_KS_LOCATION_ID);
 }
 
 void OBJECT_OT_location_clear(wmOperatorType *ot)
@@ -272,7 +272,7 @@ void OBJECT_OT_location_clear(wmOperatorType *ot)
 
 static int object_rotation_clear_exec(bContext *C, wmOperator *op)
 {
-       return object_clear_transform_generic_exec(C, op, object_clear_rot, "Rotation");
+       return object_clear_transform_generic_exec(C, op, object_clear_rot, ANIM_KS_ROTATION_ID);
 }
 
 void OBJECT_OT_rotation_clear(wmOperatorType *ot)
@@ -292,7 +292,7 @@ void OBJECT_OT_rotation_clear(wmOperatorType *ot)
 
 static int object_scale_clear_exec(bContext *C, wmOperator *op)
 {
-       return object_clear_transform_generic_exec(C, op, object_clear_scale, "Scaling");
+       return object_clear_transform_generic_exec(C, op, object_clear_scale, ANIM_KS_SCALING_ID);
 }
 
 void OBJECT_OT_scale_clear(wmOperatorType *ot)
index 7b0a056bb53a7603d9c7d94b4275736e0303decd..865d95d07ed18e7b8f5bbd9c17a3c0e58147d0c3 100644 (file)
@@ -123,8 +123,6 @@ ImBuf* get_brush_icon(Brush *brush)
                                if (!(brush->icon_imbuf)) {
                                        folder= BLI_get_folder(BLENDER_DATAFILES, "brushicons");
 
-                                       path[0]= 0;
-
                                        BLI_make_file_string(G.main->name, path, folder, brush->icon_filepath);
 
                                        if (path[0])
index b66440738b2ba6b73f5df22d438490338ae1c615..8e2a9c3019304a21712e879d29639fc0280c6620 100644 (file)
@@ -699,11 +699,11 @@ static void move_camera(bContext* C, RegionView3D* rv3d, FlyInfo* fly, int orien
                 *              TODO: need to check in future that frame changed before doing this 
                 */
                if (orientationChanged) {
-                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
                }
                if (positionChanged) {
-                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
                }
                
index fa3007d2fb7e39eb87b831a6bf771e8b80f33401..c69d2159ac270dda3c445274c3e0b862617d565d 100644 (file)
@@ -495,7 +495,7 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
        
        }
        else {
-               struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
+               struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
 
                CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
                        if(ob->mode & OB_MODE_POSE) {
@@ -625,7 +625,7 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
                
        }
        else {
-               struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
+               struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
 
                CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
                        if(ob->mode & OB_MODE_POSE) {
index 879dc4250917580569cfafee45598c3f4ae56930..1d28b594e57cdbf1293a9d47e980b37f21c8aedc 100644 (file)
@@ -4582,21 +4582,21 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
                        
                        /* insert keyframes for the affected sets of channels using the builtin KeyingSets found */
                        if (doLoc) {
-                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                        }
                        if (doRot) {
-                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                        }
                        if (doScale) {
-                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scale");
+                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                        }
                }
                /* insert keyframe in all (transform) channels */
                else {
-                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                }
                
@@ -4697,21 +4697,21 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
                                        }
                                        
                                        if (doLoc) {
-                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
                                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                        if (doRot) {
-                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
                                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                        if (doScale) {
-                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Scale");
+                                               KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
                                                ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                        }
                                }
                                /* insert keyframe in all (transform) channels */
                                else {
-                                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+                                       KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
                                        ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
                                }
                                
index 676fe1e092df6a26142b28a615e5f8fa5e9ba096..942c0d39c3753c291077a670e6915a12de84e7c6 100644 (file)
@@ -460,17 +460,45 @@ static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr)
 
 static void rna_Event_ascii_get(PointerRNA *ptr, char *value)
 {
-       wmEvent *event= (wmEvent*)ptr->id.data;
+       wmEvent *event= (wmEvent*)ptr->data;
        value[0]= event->ascii;
        value[1]= '\0';
 }
 
 static int rna_Event_ascii_length(PointerRNA *ptr)
 {
-       wmEvent *event= (wmEvent*)ptr->id.data;
+       wmEvent *event= (wmEvent*)ptr->data;
        return (event->ascii)? 1 : 0;
 }
 
+static void rna_Event_unicode_get(PointerRNA *ptr, char *value)
+{
+       /* utf8 buf isnt \0 terminated */
+       wmEvent *event= (wmEvent*)ptr->data;
+       size_t len= 0;
+
+       if (event->utf8_buf[0]) {
+               BLI_str_utf8_as_unicode_and_size(event->utf8_buf, &len);
+               if (len > 0) {
+                       memcpy(value, event->utf8_buf, len);
+               }
+       }
+
+       value[len]= '\0';
+}
+
+static int rna_Event_unicode_length(PointerRNA *ptr)
+{
+
+       wmEvent *event= (wmEvent*)ptr->data;
+       if (event->utf8_buf[0]) {
+               return BLI_str_utf8_size(event->utf8_buf); /* invalid value is checked on assignment so we dont need to account for this */
+       }
+       else {
+               return 0;
+       }
+}
+
 static void rna_Window_screen_set(PointerRNA *ptr, PointerRNA value)
 {
        wmWindow *win= (wmWindow*)ptr->data;
@@ -1358,6 +1386,11 @@ static void rna_def_event(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "ASCII", "Single ASCII character for this event");
 
 
+       prop= RNA_def_property(srna, "unicode", PROP_STRING, PROP_NONE);
+       RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+       RNA_def_property_string_funcs(prop, "rna_Event_unicode_get", "rna_Event_unicode_length", NULL);
+       RNA_def_property_ui_text(prop, "Unicode", "Single unicode character for this event");
+
        /* enums */
        prop= RNA_def_property(srna, "value", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "val");
index d8a6b192a23d61ef988beb91d3ec1c5e659dba6f..6cce5342926fa2e379c4648063349a029b9590d4 100644 (file)
@@ -208,6 +208,13 @@ void BPY_python_start(int argc, const char **argv)
        /* allow to use our own included python */
        PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
 
+       /* without this the sys.stdout may be set to 'ascii'
+        * (it is on my system at least), where printing unicode values will raise
+        * an error, this is highly annoying, another stumbling block for devs,
+        * so use a more relaxed error handler and enforce utf-8 since the rest of
+        * blender is utf-8 too - campbell */
+       BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
+
        /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
         * parse from the 'sysconfig' module which is used by 'site',
         * so for now disable site. alternatively we could copy the file. */
index 8fa90a51442694a56be391336f9725254eaf54c2..0fc00731d6036021e6a322e916e75b79f4f0e678 100644 (file)
@@ -1526,7 +1526,7 @@ void ray_trace(ShadeInput *shi, ShadeResult *shr)
        do_tra= ((shi->mode & MA_TRANSP) && (shi->mode & MA_RAYTRANSP) && shr->alpha!=1.0f && (shi->depth <= shi->mat->ray_depth_tra));
        do_mir= ((shi->mat->mode & MA_RAYMIRROR) && shi->ray_mirror!=0.0f && (shi->depth <= shi->mat->ray_depth));
        
-       /* raytrace mirror amd refract like to separate the spec color */
+       /* raytrace mirror and refract like to separate the spec color */
        if(shi->combinedflag & SCE_PASS_SPEC)
                sub_v3_v3v3(diff, shr->combined, shr->spec);
        else
index 5048166c8b7cfd04c127adbaf8b74ca97084a946..fc96c8804b2e04f7fc0646b01292fdb7f57a9807 100644 (file)
@@ -346,7 +346,9 @@ typedef struct wmEvent {
        short val;                      /* press, release, scrollvalue */
        int x, y;                       /* mouse pointer position, screen coord */
        int mval[2];            /* region mouse position, name convention pre 2.5 :) */
-       char utf8_buf[6];       /* from, ghost if utf8 is enabled for the platform */
+       char utf8_buf[6];       /* from, ghost if utf8 is enabled for the platform,
+                                                * BLI_str_utf8_size() must _always_ be valid, check
+                                                * when assigning s we dont need to check on every access after */
        char ascii;                     /* from ghost, fallback if utf8 isnt set */
        char pad;
 
index c497959f0723aee97af95efc469a6a271e71e366..6cda007fc33cfaba5aeb0577dc271dc9e559573b 100644 (file)
@@ -460,11 +460,12 @@ void WM_event_print(wmEvent *event)
 
                printf("wmEvent - type:%d/%s, val:%d/%s, "
                           "shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d, "
-                          "mouse:(%d,%d), ascii:'%c', utf8:'%.6s', "
+                          "mouse:(%d,%d), ascii:'%c', utf8:'%.*s', "
                           "keymap_idname:%s, pointer:%p\n",
                           event->type, type_id, event->val, val_id,
                           event->shift, event->ctrl, event->alt, event->oskey, event->keymodifier,
-                          event->x, event->y, event->ascii, event->utf8_buf,
+                          event->x, event->y, event->ascii,
+                      BLI_str_utf8_size(event->utf8_buf), event->utf8_buf,
                           event->keymap_idname, (void *)event);
        }
        else {
@@ -2622,16 +2623,25 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
                        
                        /* exclude arrow keys, esc, etc from text input */
                        if(type==GHOST_kEventKeyUp) {
-                               if (event.ascii<32 && event.ascii > 0) {
-                                       event.ascii= '\0';
-                               }
+                               event.ascii= '\0';
 
                                /* ghost should do this already for key up */
                                if (event.utf8_buf[0]) {
-                                       printf("%s: ghost on you're platform is misbehaving, utf8 events on key up!\n", __func__);
+                                       printf("%s: ghost on your platform is misbehaving, utf8 events on key up!\n", __func__);
                                }
                                event.utf8_buf[0]= '\0';
                        }
+                       else if (event.ascii<32 && event.ascii > 0) {
+                               event.ascii= '\0';
+                               /* TODO. should this also zero utf8?, dont for now, campbell */
+                       }
+
+                       if (event.utf8_buf[0]) {
+                               if (BLI_str_utf8_size(event.utf8_buf) == -1) {
+                                       printf("%s: ghost detected an invalid unicode character '%d'!\n", __func__, (int)(unsigned char)event.utf8_buf[0]);
+                                       event.utf8_buf[0]= '\0';
+                               }
+                       }
 
                        /* modifiers */
                        /* assigning both first and second is strange - campbell */
index 5fee5fb2a573cbb3f24a70d155893f88f3e83f76..49bb3132204dadaf5b6ff1d0b44a9a56a93f70b7 100644 (file)
 
 static GHash *global_ops_hash= NULL;
 
-#ifdef WITH_PYTHON_UI_INFO
-#  include "DNA_text_types.h"
-#  include "BKE_text.h"
-#endif
-
 /* ************ operator API, exported ********** */
 
 
@@ -3509,79 +3504,6 @@ static void operatortype_ghash_free_cb(wmOperatorType *ot)
        MEM_freeN(ot);
 }
 
-#ifdef WITH_PYTHON_UI_INFO
-
-static ScrArea *biggest_text_view(bContext *C)
-{
-       bScreen *sc= CTX_wm_screen(C);
-       ScrArea *sa, *big= NULL;
-       int size, maxsize= 0;
-
-       for(sa= sc->areabase.first; sa; sa= sa->next) {
-               if(sa->spacetype==SPACE_TEXT) {
-                       size= sa->winx * sa->winy;
-                       if(size > maxsize) {
-                               maxsize= size;
-                               big= sa;
-                       }
-               }
-       }
-       return big;
-}
-
-static int wm_text_edit_exec(bContext *C, wmOperator *op)
-{
-       Main *bmain= CTX_data_main(C);
-       Text *text;
-
-       char filepath[240];
-       int line= RNA_int_get(op->ptr, "line");
-       RNA_string_get(op->ptr, "filepath", filepath);
-
-       for (text=bmain->text.first; text; text=text->id.next) {
-               if (text->name && BLI_path_cmp(text->name, filepath) == 0) {
-                       break;
-               }
-       }
-
-       if (text == NULL) {
-               text= add_text(filepath, bmain->name);
-       }
-
-       if (text == NULL) {
-               BKE_reportf(op->reports, RPT_WARNING, "file: '%s' can't be opened", filepath);
-               return OPERATOR_CANCELLED;
-       }
-       else {
-               /* naughty!, find text area to set, not good behavior
-                * but since this is a dev tool lets allow it - campbell */
-               ScrArea *sa= biggest_text_view(C);
-               if(sa) {
-                       SpaceText *st= sa->spacedata.first;
-                       st->text= text;
-               }
-
-               txt_move_toline(text, line - 1, FALSE);
-               WM_event_add_notifier(C, NC_TEXT|ND_CURSOR, text);
-       }
-
-       return OPERATOR_FINISHED;
-}
-
-static void WM_OT_text_edit(wmOperatorType *ot)
-{
-       ot->name= "Edit Text File";
-       ot->idname= "WM_OT_text_edit";
-
-       ot->exec= wm_text_edit_exec;
-
-       RNA_def_string_file_path(ot->srna, "filepath", "", FILE_MAX, "Path", "");
-       RNA_def_int(ot->srna, "line", 0, INT_MIN, INT_MAX, "Line", "", 0, INT_MAX);
-}
-
-#endif /* WITH_PYTHON_UI_INFO */
-
-
 /* ******************************************************* */
 /* called on initialize WM_exit() */
 void wm_operatortype_free(void)
@@ -3624,11 +3546,6 @@ void wm_operatortype_init(void)
        WM_operatortype_append(WM_OT_collada_export);
        WM_operatortype_append(WM_OT_collada_import);
 #endif
-
-#ifdef WITH_PYTHON_UI_INFO
-       WM_operatortype_append(WM_OT_text_edit);
-#endif
-
 }
 
 /* circleselect-like modal operators */
index 00b4f1053482cc02ff299a9db825359d63882253..3914cb9aef5f5b270248286806cdc3f84e6bf7e5 100644 (file)
@@ -51,7 +51,7 @@ class PHY_IMotionState
                virtual void    getWorldPosition(float& posX,float& posY,float& posZ)=0;
                virtual void    getWorldScaling(float& scaleX,float& scaleY,float& scaleZ)=0;
                virtual void    getWorldOrientation(float& quatIma0,float& quatIma1,float& quatIma2,float& quatReal)=0;
-               // ori = array 12 floats, [0..3] = first column + 0, [4..7] = second colum, [8..11] = third column
+               // ori = array 12 floats, [0..3] = first column + 0, [4..7] = second column, [8..11] = third column
                virtual void    getWorldOrientation(float* ori)=0;
                virtual void    setWorldOrientation(const float* ori)=0;