[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37946] branches/soc-2011-tomato: Merging r37908 through r37945 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Wed Jun 29 14:39:02 CEST 2011
Revision: 37946
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37946
Author: nazgul
Date: 2011-06-29 12:39:01 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
Merging r37908 through r37945 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37908
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37945
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
branches/soc-2011-tomato/release/scripts/modules/console/intellisense.py
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/creator.c
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36831-37907
+ /trunk/blender:36831-37945
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-06-29 12:39:01 UTC (rev 37946)
@@ -53,11 +53,6 @@
set(FIRST_RUN "TRUE")
endif()
-# set default build type to Release
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
-endif()
-
# this starts out unset
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
@@ -149,7 +144,7 @@
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
# Audio/Video format support
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
if(APPLE OR (WIN32 AND NOT UNIX))
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
@@ -623,8 +618,8 @@
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
set(FREETYPE_INCLUDE_DIRS
- ${FREETYPE}/include
- ${FREETYPE}/include/freetype2
+ ${LIBDIR}/freetype/include
+ ${LIBDIR}/freetype/include/freetype2
)
set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py 2011-06-29 12:39:01 UTC (rev 37946)
@@ -22,24 +22,29 @@
Give access to blender data and utility functions.
"""
+__all__ = (
+ "app",
+ "context",
+ "data",
+ "ops",
+ "path",
+ "props",
+ "types",
+ "utils",
+)
+
+
# internal blender C module
-import _bpy
-from _bpy import types, props, app
+from _bpy import types, props, app, data, context
-data = _bpy.data
-context = _bpy.context
-
# python modules
-from . import utils, path
-from . import ops as _ops_module
+from . import utils, path, ops
# fake operator module
-ops = _ops_module.ops_fake_module
+ops = ops.ops_fake_module
-import sys as _sys
-
-
def _main():
+ import sys as _sys
# Possibly temp. addons path
from os.path import join, dirname, normpath
@@ -59,3 +64,5 @@
_main()
+
+del _main
\ No newline at end of file
Modified: branches/soc-2011-tomato/release/scripts/modules/console/intellisense.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/console/intellisense.py 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/release/scripts/modules/console/intellisense.py 2011-06-29 12:39:01 UTC (rev 37946)
@@ -53,7 +53,7 @@
re.UNICODE)
-def complete(line, cursor, namespace, private=True):
+def complete(line, cursor, namespace, private):
"""Returns a list of possible completions:
* name completion
@@ -82,6 +82,10 @@
if RE_MODULE.match(line):
from . import complete_import
matches = complete_import.complete(line)
+ print(private)
+ if not private:
+ matches[:] = [m for m in matches if m[:1] != "_"]
+ matches.sort()
else:
from . import complete_namespace
matches = complete_namespace.complete(word, namespace, private)
@@ -130,11 +134,15 @@
else:
# causes blender bug [#27495] since string keys may contain '.'
# scrollback = ' '.join([m.split('.')[-1] for m in matches])
+
+ # add white space to align with the cursor
+ white_space = " " + (" " * (cursor + len(prefix)))
word_prefix = word + prefix
- scrollback = ' '.join(
- [m[len(word_prefix):]
+ scrollback = '\n'.join(
+ [white_space + m[len(word_prefix):]
if (word_prefix and m.startswith(word_prefix))
- else m.split('.')[-1]
+ else
+ white_space + m.split('.')[-1]
for m in matches])
no_calltip = True
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_edit.c 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_edit.c 2011-06-29 12:39:01 UTC (rev 37946)
@@ -1689,7 +1689,7 @@
{
/* identifiers */
ot->name= "Shade Flat";
- ot->description= "Display faces 'smooth' (using vertext normals)";
+ ot->description= "Display faces 'flat'";
ot->idname= "OBJECT_OT_shade_flat";
/* api callbacks */
@@ -1704,7 +1704,7 @@
{
/* identifiers */
ot->name= "Shade Smooth";
- ot->description= "Display faces 'flat'";
+ ot->description= "Display faces 'smooth' (using vertext normals)";
ot->idname= "OBJECT_OT_shade_smooth";
/* api callbacks */
Modified: branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2011-06-29 12:39:01 UTC (rev 37946)
@@ -189,11 +189,6 @@
/* set callbacks, exported to sequence render too.
Only call in foreground (UI) renders. */
-static void render_error_reports(void *reports, const char *str)
-{
- BKE_report(reports, RPT_ERROR, str);
-}
-
/* executes blocking render */
static int screen_render_exec(bContext *C, wmOperator *op)
{
@@ -214,7 +209,6 @@
G.afbreek= 0;
RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
- RE_error_cb(re, op->reports, render_error_reports);
ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
@@ -226,11 +220,15 @@
since sequence rendering can call that recursively... (peter) */
seq_stripelem_cache_cleanup();
+ RE_SetReports(re, op->reports);
+
if(is_animation)
- RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
+ RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step);
else
RE_BlenderFrame(re, mainp, scene, NULL, camera_override, lay, scene->r.cfra, is_write_still);
+ RE_SetReports(re, NULL);
+
// no redraw needed, we leave state as we entered it
ED_update_for_newframe(mainp, scene, CTX_wm_screen(C), 1);
@@ -374,10 +372,14 @@
rj->do_update= do_update;
rj->progress= progress;
+ RE_SetReports(rj->re, rj->reports);
+
if(rj->anim)
- RE_BlenderAnim(rj->re, rj->main, rj->scene, rj->camera_override, rj->lay, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step, rj->reports);
+ RE_BlenderAnim(rj->re, rj->main, rj->scene, rj->camera_override, rj->lay, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->r.frame_step);
else
RE_BlenderFrame(rj->re, rj->main, rj->scene, rj->srl, rj->camera_override, rj->lay, rj->scene->r.cfra, rj->write_still);
+
+ RE_SetReports(rj->re, NULL);
}
static void render_endjob(void *rjv)
@@ -470,7 +472,7 @@
if(WM_jobs_test(CTX_wm_manager(C), scene))
return OPERATOR_CANCELLED;
- if(!RE_is_rendering_allowed(scene, camera_override, op->reports, render_error_reports)) {
+ if(!RE_is_rendering_allowed(scene, camera_override, op->reports)) {
return OPERATOR_CANCELLED;
}
@@ -578,8 +580,6 @@
rj->re= re;
G.afbreek= 0;
- RE_error_cb(re, op->reports, render_error_reports);
-
WM_jobs_start(CTX_wm_manager(C), steve);
WM_cursor_wait(0);
@@ -596,7 +596,6 @@
return OPERATOR_RUNNING_MODAL;
}
-
/* contextual render, using current scene, view3d? */
void RENDER_OT_render(wmOperatorType *ot)
{
Modified: branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c 2011-06-29 12:39:01 UTC (rev 37946)
@@ -792,7 +792,9 @@
uiItemR(col, userptr, "frame_offset", 0, NULL, ICON_NONE);
col= uiLayoutColumn(split, 0);
- uiItemR(col, userptr, "fields_per_frame", 0, "Fields", ICON_NONE);
+ row= uiLayoutRow(col, 0);
+ uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields"));
+ uiItemR(row, userptr, "fields_per_frame", 0, "Fields", ICON_NONE);
uiItemR(col, userptr, "use_auto_refresh", 0, NULL, ICON_NONE);
uiItemR(col, userptr, "use_cyclic", 0, NULL, ICON_NONE);
}
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c 2011-06-29 10:47:43 UTC (rev 37945)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c 2011-06-29 12:39:01 UTC (rev 37946)
@@ -32,6 +32,7 @@
#include "DNA_scene_types.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
#include "rna_internal.h"
@@ -271,6 +272,12 @@
prop= RNA_def_string(func, "info", "", 0, "Info", "");
RNA_def_property_flag(prop, PROP_REQUIRED);
+ func= RNA_def_function(srna, "report", "RE_engine_report");
+ prop= RNA_def_enum_flag(func, "type", wm_report_items, 0, "Type", "");
+ RNA_def_property_flag(prop, PROP_REQUIRED);
+ prop= RNA_def_string(func, "message", "", 0, "Report Message", "");
+ RNA_def_property_flag(prop, PROP_REQUIRED);
+
/* registration */
RNA_define_verify_sdna(0);
Modified: branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h 2011-06-29 10:47:43 UTC (rev 37945)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list