[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27625] trunk/blender: merge own commits into render branch into trunk since 27560
Campbell Barton
ideasman42 at gmail.com
Sat Mar 20 17:41:01 CET 2010
Revision: 27625
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27625
Author: campbellbarton
Date: 2010-03-20 17:41:01 +0100 (Sat, 20 Mar 2010)
Log Message:
-----------
merge own commits into render branch into trunk since 27560
27562, 27570, 27571, 27574, 27576, 27577, 27579, 27590, 27591, 27594, 27595, 27596, 27599, 27605, 27611, 27612, 27613, 27614, 27623
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/release/scripts/io/import_scene_obj.py
trunk/blender/release/scripts/op/image.py
trunk/blender/release/scripts/ui/properties_data_curve.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/blenkernel/BKE_curve.h
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenlib/BLI_listbase.h
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/listbase.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesdna/DNA_anim_types.h
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/python/doc/sphinx_doc_gen.py
trunk/blender/source/blender/python/generic/IDProp.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/creator.c
Added Paths:
-----------
trunk/blender/source/blender/python/doc/sphinx_doc_gen.sh
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/CMakeLists.txt 2010-03-20 16:41:01 UTC (rev 27625)
@@ -181,11 +181,12 @@
ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
+ SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC
ImfXdr.h
PATHS
+ ${OPENEXR}/include/OpenEXR
/usr/local/include/OpenEXR
- /usr/include/OpenEXR
/sw/include/OpenEXR
/opt/local/include/OpenEXR
/opt/csw/include/OpenEXR
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/release/scripts/io/import_scene_obj.py 2010-03-20 16:41:01 UTC (rev 27625)
@@ -316,7 +316,7 @@
def load_image(imagepath, dirname):
if os.path.exists(imagepath):
- return bpy.data.add_image(imagepath)
+ return bpy.data.images.load(imagepath)
variants = [os.path.join(dirname, imagepath), os.path.join(dirname, os.path.basename(imagepath))]
Modified: trunk/blender/release/scripts/op/image.py
===================================================================
--- trunk/blender/release/scripts/op/image.py 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/release/scripts/op/image.py 2010-03-20 16:41:01 UTC (rev 27625)
@@ -19,32 +19,65 @@
# <pep8 compliant>
import bpy
+from bpy.props import StringProperty
+class EditExternally(bpy.types.Operator):
+ '''Edit image in an external application'''
+ bl_idname = "image.external_edit"
+ bl_label = "Image Edit Externally"
+ bl_options = {'REGISTER'}
-def image_editor_guess(context):
- import platform
- system = platform.system()
-
- image_editor = context.user_preferences.filepaths.image_editor
+ path = StringProperty(name="File Path", description="Path to an image file", maxlen= 1024, default= "")
- # use image editor in the preferences when available.
- if not image_editor:
- if system == 'Windows':
- image_editor = ["start"] # not tested!
- elif system == 'Darwin':
- image_editor = ["open"]
+ def _editor_guess(self, context):
+ import platform
+ system = platform.system()
+
+ image_editor = context.user_preferences.filepaths.image_editor
+
+ # use image editor in the preferences when available.
+ if not image_editor:
+ if system == 'Windows':
+ image_editor = ["start"] # not tested!
+ elif system == 'Darwin':
+ image_editor = ["open"]
+ else:
+ image_editor = ["gimp"]
else:
- image_editor = ["gimp"]
- else:
- if system == 'Darwin':
- # blender file selector treats .app as a folder
- # and will include a trailing backslash, so we strip it.
- image_editor.rstrip('\\')
- image_editor = ["open", "-a", image_editor]
+ if system == 'Darwin':
+ # blender file selector treats .app as a folder
+ # and will include a trailing backslash, so we strip it.
+ image_editor.rstrip('\\')
+ image_editor = ["open", "-a", image_editor]
- return image_editor
+ return image_editor
+ def execute(self, context):
+ import subprocess
+ path = self.properties.path
+ image_editor = self._editor_guess(context)
+ cmd = []
+ cmd.extend(image_editor)
+ cmd.append(bpy.utils.expandpath(path))
+
+ subprocess.Popen(cmd)
+
+ return {'FINISHED'}
+
+ def invoke(self, context, event):
+ try:
+ path = context.space_data.image.filename
+ except:
+ self.report({'ERROR'}, "Image not found on disk")
+ return {'CANCELLED'}
+
+ self.properties.path = path
+ self.execute(context)
+
+ return {'FINISHED'}
+
+
class SaveDirty(bpy.types.Operator):
'''Select object matching a naming pattern'''
bl_idname = "image.save_dirty"
@@ -79,7 +112,6 @@
import subprocess
EXT = "png" # could be made an option but for now ok
- image_editor = image_editor_guess(context)
for image in bpy.data.images:
image.tag = True
@@ -124,12 +156,8 @@
image_new.file_format = 'PNG'
image_new.save()
- cmd = []
- cmd.extend(image_editor)
- cmd.append(bpy.utils.expandpath(filename_final))
+ bpy.ops.image.external_edit(path=filename_final)
- subprocess.Popen(cmd)
-
return {'FINISHED'}
@@ -155,6 +183,7 @@
classes = [
+ EditExternally,
SaveDirty,
ProjectEdit,
ProjectApply]
Modified: trunk/blender/release/scripts/ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_curve.py 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/release/scripts/ui/properties_data_curve.py 2010-03-20 16:41:01 UTC (rev 27625)
@@ -44,7 +44,7 @@
def poll(self, context):
curve = context.curve
- return (curve and curve.active_spline)
+ return (curve and curve.splines.active)
class DATA_PT_context_curve(DataButtonsPanel):
@@ -205,7 +205,7 @@
ob = context.object
curve = context.curve
- act_spline = curve.active_spline
+ act_spline = curve.splines.active
is_surf = (ob.type == 'SURFACE')
is_poly = (act_spline.type == 'POLY')
Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/release/scripts/ui/space_image.py 2010-03-20 16:41:01 UTC (rev 27625)
@@ -115,6 +115,8 @@
if ima.source == 'SEQUENCE':
layout.operator("image.save_sequence")
+ layout.operator("image.external_edit", "Edit Externally")
+
if not show_render:
layout.separator()
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-03-20 16:41:01 UTC (rev 27625)
@@ -1413,8 +1413,7 @@
addons = [(mod, addon_info_get(mod)) for mod in self._addon_list()]
cats = {info["category"] for mod, info in addons}
- cats.add("")
- cats.remove("")
+ cats.discard("")
cats = ['All', 'Disabled', 'Enabled'] + sorted(cats)
@@ -1489,7 +1488,25 @@
split.separator()
split.separator()
+ # Append missing scripts
+ # First collect scripts that are used but have no script file.
+ module_names = {mod.__name__ for mod, info in addons}
+ missing_modules = {ext for ext in used_ext if ext not in module_names}
+ if missing_modules and filter in ("All", "Enabled"):
+ layout.column().separator()
+ layout.column().label(text="Missing script files")
+
+ module_names = {mod.__name__ for mod, info in addons}
+ for ext in sorted(missing_modules):
+ # Addon UI Code
+ box = layout.column().box()
+ column = box.column()
+ row = column.row()
+
+ row.label(text=ext, icon="ERROR")
+ row.operator("wm.addon_disable").module = ext
+
from bpy.props import *
@@ -1537,22 +1554,9 @@
# check if add-on is written for current blender version, or raise a warning
info = addon_info_get(mod)
- if info["blender"]:
- version = info["blender"].split(".", 2)
- for i in range(len(version)):
- try:
- version[i] = int(version[i])
- except:
- break
+ if info.get("blender", (0, 0, 0)) > bpy.app.version:
+ self.report("WARNING','This script was written for a newer version of Blender and might not function (correctly).\nThe script is enabled though.")
- if version[i] > bpy.app.version[i]:
- self.report("WARNING','This script was written for a newer version of Blender \
-and might not function (correctly).\nThe script is enabled though.")
- elif version[i] == bpy.app.version[i]:
- continue
- else:
- break
-
return {'FINISHED'}
@@ -1668,7 +1672,6 @@
info = addon_info_get(mod)
info["expanded"] = not info["expanded"]
- print(info["expanded"])
return {'FINISHED'}
Modified: trunk/blender/source/blender/blenkernel/BKE_curve.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_curve.h 2010-03-20 16:28:51 UTC (rev 27624)
+++ trunk/blender/source/blender/blenkernel/BKE_curve.h 2010-03-20 16:41:01 UTC (rev 27625)
@@ -40,12 +40,12 @@
struct BezTriple;
struct BevList;
-#define KNOTSU(nu) ( (nu)->orderu+ (nu)->pntsu+ (((nu)->flagu & CU_CYCLIC) ? (nu->orderu-1) : 0) )
-#define KNOTSV(nu) ( (nu)->orderv+ (nu)->pntsv+ (((nu)->flagv & CU_CYCLIC) ? (nu->orderv-1) : 0) )
+#define KNOTSU(nu) ( (nu)->orderu+ (nu)->pntsu+ (((nu)->flagu & CU_NURB_CYCLIC) ? (nu->orderu-1) : 0) )
+#define KNOTSV(nu) ( (nu)->orderv+ (nu)->pntsv+ (((nu)->flagv & CU_NURB_CYCLIC) ? (nu->orderv-1) : 0) )
/* Non cyclic nurbs have 1 less segment */
-#define SEGMENTSU(nu) ( ((nu)->flagu & CU_CYCLIC) ? (nu)->pntsu : (nu)->pntsu-1 )
-#define SEGMENTSV(nu) ( ((nu)->flagv & CU_CYCLIC) ? (nu)->pntsv : (nu)->pntsv-1 )
+#define SEGMENTSU(nu) ( ((nu)->flagu & CU_NURB_CYCLIC) ? (nu)->pntsu : (nu)->pntsu-1 )
+#define SEGMENTSV(nu) ( ((nu)->flagv & CU_NURB_CYCLIC) ? (nu)->pntsv : (nu)->pntsv-1 )
#define CU_DO_TILT(cu, nu) (((nu->flag & CU_2D) && (cu->flag & CU_3D)==0) ? 0 : 1)
#define CU_DO_RADIUS(cu, nu) ((CU_DO_TILT(cu, nu) || cu->bevobj || cu->ext1!=0.0 || cu->ext2!=0.0) ? 1:0)
@@ -89,6 +89,9 @@
void switchdirectionNurb( struct Nurb *nu);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list