svn merge ^/trunk/blender -r48527:48537

release/scripts/modules/bl_i18n_utils/bl_process_msg.py

@@ -108,8 +108,10 @@ def dump_messages_rna(messages, check_ctxt):
         path_resolve = type(bpy.context).__base__.path_resolve
         for idname in op_ids:
             op = get_instance(idname)
-            if 'INTERNAL' in path_resolve(op, "bl_options"):
-                blacklist_rna_class.append(idname)
+            # XXX Do not skip INTERNAL's anymore, some of those ops
+            #     show up in UI now!
+#            if 'INTERNAL' in path_resolve(op, "bl_options"):
+#                blacklist_rna_class.append(idname)
 
         # ---------------------------------------------------------------------
         # Collect builtin classes we don't need to doc
@@ -467,7 +469,7 @@ def dump_messages(do_messages, do_checks):
         for c in check_ctxt.values():
             keys |= c
         # XXX Temp, see below
-        c -= check_ctxt["multi_rnatip"]
+        keys -= check_ctxt["multi_rnatip"]
         for key in keys:
             if key in check_ctxt["undoc_ops"]:
                 print("\tThe following operators are undocumented:")

release/scripts/modules/bl_i18n_utils/spell_check_utils.py

@@ -62,7 +62,7 @@ dict_uimsgs = {
     "autoscale",
     "autosmooth",
     "autosplit",
-    "backface",
+    "backface", "backfacing",
     "backimage",
     "backscattered",
     "bandnoise",
@@ -146,7 +146,7 @@ dict_uimsgs = {
     "unbake",
     "uncomment",
     "undeformed",
-    "undistort",
+    "undistort", "undistortion",
     "ungroup",
     "unhide",
     "unindent",
@@ -170,6 +170,7 @@ dict_uimsgs = {
     "blockiness", "blocky",
     "collider", "colliders",
     "deformer", "deformers",
+    "determinator",
     "editability",
     "keyer",
     "lacunarity",
@@ -194,11 +195,15 @@ dict_uimsgs = {
     "config", "configs",
     "const",
     "coord", "coords",
+    "degr",
     "dof",
     "dupli", "duplis",
     "eg",
     "esc",
+    "expr",
     "fac",
+    "fra",
+    "frs",
     "grless",
     "http",
     "init",
@@ -210,6 +215,7 @@ dict_uimsgs = {
     "multicam",
     "num",
     "ok",
+    "orco",
     "ortho",
     "persp",
     "pref", "prefs",
@@ -316,6 +322,7 @@ dict_uimsgs = {
     "breakdowner",
     "bspline",
     "bweight",
+    "colorband",
     "datablock", "datablocks",
     "dopesheet",
     "dupliface", "duplifaces",

release/scripts/startup/bl_ui/properties_physics_fluid.py

@@ -117,10 +117,14 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
             col.prop(fluid, "use_animated_mesh")
 
             col = split.column()
-            col.label(text="Slip Type:")
-            col.prop(fluid, "slip_type", text="")
+            subsplit = col.split()
+            subcol = subsplit.column()
+            if fluid.use_animated_mesh:
+                subcol.enabled = False
+            subcol.label(text="Slip Type:")
+            subcol.prop(fluid, "slip_type", text="")
             if fluid.slip_type == 'PARTIALSLIP':
-                col.prop(fluid, "partial_slip_factor", slider=True, text="Amount")
+                subcol.prop(fluid, "partial_slip_factor", slider=True, text="Amount")
 
             col.label(text="Impact:")
             col.prop(fluid, "impact_factor", text="Factor")