[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27593] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27541 :27592
Brecht Van Lommel
brecht at blender.org
Thu Mar 18 11:24:40 CET 2010
Revision: 27593
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27593
Author: blendix
Date: 2010-03-18 11:24:40 +0100 (Thu, 18 Mar 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27541:27592
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/release/scripts/keyingsets/keyingsets_builtins.py
branches/render25/release/scripts/keyingsets/keyingsets_utils.py
branches/render25/release/scripts/op/image.py
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/properties_material.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/space_node.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/include/ED_fileselect.h
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/makesdna/DNA_curve_types.h
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_main_api.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/render25/release/scripts/keyingsets/keyingsets_builtins.py
branches/render25/release/scripts/keyingsets/keyingsets_utils.py
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-03-18 10:16:04 UTC (rev 27592)
+++ branches/render25/CMakeLists.txt 2010-03-18 10:24:40 UTC (rev 27593)
@@ -193,9 +193,9 @@
)
SET(OPENEXR_LIB Half IlmImf Iex Imath)
- SET(FFMPEG /usr)
+ SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+ SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
IF(WITH_FFTW3)
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-18 10:16:04 UTC (rev 27592)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-18 10:24:40 UTC (rev 27593)
@@ -774,15 +774,17 @@
GHOST_TSuccess GHOST_SystemCocoa::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual)
{
GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
-
*window = currentWindow;
+ if(!currentWindow) return GHOST_kFailure;
+
return currentWindow->setState(GHOST_kWindowStateFullScreen);
}
GHOST_TSuccess GHOST_SystemCocoa::endFullScreen(void)
{
GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
+ if(!currentWindow) return GHOST_kFailure;
return currentWindow->setState(GHOST_kWindowStateNormal);
}
@@ -809,6 +811,8 @@
{
float xf=(float)x, yf=(float)y;
GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
+ if (!window) return GHOST_kFailure;
+
NSScreen *windowScreen = window->getScreen();
NSRect screenRect = [windowScreen frame];
Modified: branches/render25/release/scripts/keyingsets/keyingsets_builtins.py
===================================================================
--- branches/render25/release/scripts/keyingsets/keyingsets_builtins.py 2010-03-18 10:16:04 UTC (rev 27592)
+++ branches/render25/release/scripts/keyingsets/keyingsets_builtins.py 2010-03-18 10:24:40 UTC (rev 27593)
@@ -1,236 +1,236 @@
-# Built-In Keying Sets
-# None of these Keying Sets should be removed, as these
-# are needed by various parts of Blender in order for them
-# to work correctly.
-
-import bpy
-from keyingsets_utils import *
-
-###############################
-# Built-In KeyingSets
-
-# Location
-class BUILTIN_KSI_Location(bpy.types.KeyingSetInfo):
- bl_idname = "Location"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_location
-
-# Rotation
-class BUILTIN_KSI_Rotation(bpy.types.KeyingSetInfo):
- bl_idname = "Rotation"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_rotation
-
-# Scale
-class BUILTIN_KSI_Scaling(bpy.types.KeyingSetInfo):
- bl_idname = "Scaling"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_scaling
-
-# ------------
-
-# LocRot
-class BUILTIN_KSI_LocRot(bpy.types.KeyingSetInfo):
- bl_idname = "LocRot"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- def generate(self, context, ks, data):
- # location
- RKS_GEN_location(self, context, ks, data)
- # rotation
- RKS_GEN_rotation(self, context, ks, data)
-
-# LocScale
-class BUILTIN_KSI_LocScale(bpy.types.KeyingSetInfo):
- bl_idname = "LocScale"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- def generate(self, context, ks, data):
- # location
- RKS_GEN_location(self, context, ks, data)
- # scale
- RKS_GEN_scaling(self, context, ks, data)
-
-# LocRotScale
-class BUILTIN_KSI_LocRotScale(bpy.types.KeyingSetInfo):
- bl_idname = "LocRotScale"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- def generate(self, context, ks, data):
- # location
- RKS_GEN_location(self, context, ks, data)
- # rotation
- RKS_GEN_rotation(self, context, ks, data)
- # scale
- RKS_GEN_scaling(self, context, ks, data)
-
-# RotScale
-class BUILTIN_KSI_RotScale(bpy.types.KeyingSetInfo):
- bl_idname = "RotScale"
- bl_builtin = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- def generate(self, context, ks, data):
- # rotation
- RKS_GEN_rotation(self, context, ks, data)
- # scaling
- RKS_GEN_scaling(self, context, ks, data)
-
-# ------------
-
-# Location
-class BUILTIN_KSI_VisualLoc(bpy.types.KeyingSetInfo):
- bl_idname = "Visual Location"
- bl_builtin = True
-
- insertkey_visual = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_location
-
-# Rotation
-class BUILTIN_KSI_VisualRot(bpy.types.KeyingSetInfo):
- bl_idname = "Visual Rotation"
- bl_builtin = True
-
- insertkey_visual = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_rotation
-
-# VisualLocRot
-class BUILTIN_KSI_VisualLocRot(bpy.types.KeyingSetInfo):
- bl_idname = "Visual LocRot"
- bl_builtin = True
-
- insertkey_visual = True
-
- # poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- def generate(self, context, ks, data):
- # location
- RKS_GEN_location(self, context, ks, data)
- # rotation
- RKS_GEN_rotation(self, context, ks, data)
-
-# ------------
-
-# Available
-class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo):
- bl_idname = "Available"
- bl_builtin = True
-
- # poll - use predefined callback for selected objects
- # TODO: this should really check whether the selected object (or datablock)
- # has any animation data defined yet
- poll = RKS_POLL_selected_objects
-
- # iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = RKS_GEN_available
-
-###############################
-
-classes = [
- BUILTIN_KSI_Location,
- BUILTIN_KSI_Rotation,
- BUILTIN_KSI_Scaling,
-
- BUILTIN_KSI_LocRot,
- BUILTIN_KSI_LocScale,
- BUILTIN_KSI_LocRotScale,
- BUILTIN_KSI_RotScale,
-
- BUILTIN_KSI_VisualLoc,
- BUILTIN_KSI_VisualRot,
- BUILTIN_KSI_VisualLocRot,
-
- BUILTIN_KSI_Available,
-]
-
-
-def register():
- register = bpy.types.register
- for cls in classes:
- register(cls)
-
-
-def unregister():
- unregister = bpy.types.unregister
- for cls in classes:
- unregister(cls)
-
-if __name__ == "__main__":
- register()
-
-###############################
+# Built-In Keying Sets
+# None of these Keying Sets should be removed, as these
+# are needed by various parts of Blender in order for them
+# to work correctly.
+
+import bpy
+from keyingsets_utils import *
+
+###############################
+# Built-In KeyingSets
+
+# Location
+class BUILTIN_KSI_Location(bpy.types.KeyingSetInfo):
+ bl_idname = "Location"
+ bl_builtin = True
+
+ # poll - use predefined callback for selected bones/objects
+ poll = RKS_POLL_selected_items
+
+ # iterator - use callback for selected bones/objects
+ iterator = RKS_ITER_selected_item
+
+ # generator - use callback for location
+ generate = RKS_GEN_location
+
+# Rotation
+class BUILTIN_KSI_Rotation(bpy.types.KeyingSetInfo):
+ bl_idname = "Rotation"
+ bl_builtin = True
+
+ # poll - use predefined callback for selected bones/objects
+ poll = RKS_POLL_selected_items
+
+ # iterator - use callback for selected bones/objects
+ iterator = RKS_ITER_selected_item
+
+ # generator - use callback for location
+ generate = RKS_GEN_rotation
+
+# Scale
+class BUILTIN_KSI_Scaling(bpy.types.KeyingSetInfo):
+ bl_idname = "Scaling"
+ bl_builtin = True
+
+ # poll - use predefined callback for selected bones/objects
+ poll = RKS_POLL_selected_items
+
+ # iterator - use callback for selected bones/objects
+ iterator = RKS_ITER_selected_item
+
+ # generator - use callback for location
+ generate = RKS_GEN_scaling
+
+# ------------
+
+# LocRot
+class BUILTIN_KSI_LocRot(bpy.types.KeyingSetInfo):
+ bl_idname = "LocRot"
+ bl_builtin = True
+
+ # poll - use predefined callback for selected bones/objects
+ poll = RKS_POLL_selected_items
+
+ # iterator - use callback for selected bones/objects
+ iterator = RKS_ITER_selected_item
+
+ # generator - use callback for location
+ def generate(self, context, ks, data):
+ # location
+ RKS_GEN_location(self, context, ks, data)
+ # rotation
+ RKS_GEN_rotation(self, context, ks, data)
+
+# LocScale
+class BUILTIN_KSI_LocScale(bpy.types.KeyingSetInfo):
+ bl_idname = "LocScale"
+ bl_builtin = True
+
+ # poll - use predefined callback for selected bones/objects
+ poll = RKS_POLL_selected_items
+
+ # iterator - use callback for selected bones/objects
+ iterator = RKS_ITER_selected_item
+
+ # generator - use callback for location
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list