[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43977] branches/bmesh/blender: svn merge ^/trunk/blender -r43934:43976
Campbell Barton
ideasman42 at gmail.com
Wed Feb 8 06:45:23 CET 2012
Revision: 43977
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43977
Author: campbellbarton
Date: 2012-02-08 05:45:16 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43934:43976
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43934
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.h
branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h
branches/bmesh/blender/release/scripts/modules/bpy/utils.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/anim_utils.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
branches/bmesh/blender/release/scripts/modules/console/complete_import.py
branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/release/scripts/startup/bl_operators/sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_logic.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_nla.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
branches/bmesh/blender/release/scripts/templates/ui_menu.py
branches/bmesh/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/makesdna/DNA_genfile.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm_api.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/tools/spell_check_source.py
branches/bmesh/blender/source/tools/spell_check_source_config.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872
/trunk/blender:39992-43934
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872
/trunk/blender:39992-43976
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/GNUmakefile 2012-02-08 05:45:16 UTC (rev 43977)
@@ -169,6 +169,7 @@
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo " * check_spelling - check for spelling errors (Python only for now)"
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
@@ -242,7 +243,10 @@
$(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+check_spelling:
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py `find $(BLENDER_DIR)/release/scripts -name "*.py" | sort`
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_session.cpp 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/intern/cycles/blender/blender_session.cpp 2012-02-08 05:45:16 UTC (rev 43977)
@@ -191,14 +191,8 @@
BL::RenderResult::layers_iterator b_iter;
BL::RenderLayers b_rr_layers(r.ptr);
- int active = 0;
-
/* render each layer */
- for(b_rr.layers.begin(b_iter); b_iter != b_rr.layers.end(); ++b_iter, ++active) {
- /* single layer render */
- if(r.use_single_layer())
- active = b_rr_layers.active_index();
-
+ for(b_rr.layers.begin(b_iter); b_iter != b_rr.layers.end(); ++b_iter) {
/* set layer */
b_rlay = *b_iter;
@@ -226,7 +220,7 @@
session->reset(buffer_params, session_params.samples);
/* update scene */
- sync->sync_data(b_v3d, active);
+ sync->sync_data(b_v3d, b_iter->name().c_str());
/* render */
session->start();
@@ -394,7 +388,7 @@
void BlenderSession::update_status_progress()
{
- string status, substatus;
+ string timestatus, status, substatus;
float progress;
double total_time;
char time_str[128];
@@ -403,13 +397,13 @@
get_progress(progress, total_time);
BLI_timestr(total_time, time_str);
- status = "Elapsed: " + string(time_str) + " | " + status;
+ timestatus = "Elapsed: " + string(time_str) + " | ";
if(substatus.size() > 0)
status += " | " + substatus;
if(status != last_status) {
- RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", status.c_str());
+ RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", (timestatus + status).c_str());
last_status = status;
}
if(progress != last_progress) {
Modified: branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp 2012-02-08 05:45:16 UTC (rev 43977)
@@ -122,7 +122,7 @@
return recalc;
}
-void BlenderSync::sync_data(BL::SpaceView3D b_v3d, int layer)
+void BlenderSync::sync_data(BL::SpaceView3D b_v3d, const char *layer)
{
sync_render_layers(b_v3d);
sync_integrator(layer);
@@ -133,7 +133,7 @@
/* Integrator */
-void BlenderSync::sync_integrator(int layer)
+void BlenderSync::sync_integrator(const char *layer)
{
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
@@ -155,8 +155,21 @@
integrator->no_caustics = get_boolean(cscene, "no_caustics");
integrator->seed = get_int(cscene, "seed");
- integrator->layer_flag = render_layers[layer].layer;
+ /* render layer */
+ int active_layer = 0;
+
+ if(layer) {
+ for(int i = 0; i < render_layers.size(); i++) {
+ if(render_layers[i].name == layer) {
+ active_layer = i;
+ break;
+ }
+ }
+ }
+
+ integrator->layer_flag = render_layers[active_layer].layer;
+
if(integrator->modified(previntegrator))
integrator->tag_update(scene);
}
@@ -208,6 +221,7 @@
/* single layer for now */
RenderLayerInfo rlay;
+ rlay.name = b_rlay->name();
rlay.scene_layer = get_layer(b_scene.layers());
rlay.layer = get_layer(b_rlay->layers());
rlay.material_override = b_rlay->material_override();
Modified: branches/bmesh/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_sync.h 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/intern/cycles/blender/blender_sync.h 2012-02-08 05:45:16 UTC (rev 43977)
@@ -54,7 +54,7 @@
/* sync */
bool sync_recalc();
- void sync_data(BL::SpaceView3D b_v3d, int layer = 0);
+ void sync_data(BL::SpaceView3D b_v3d, const char *layer = 0);
void sync_camera(int width, int height);
void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height);
@@ -70,7 +70,7 @@
void sync_materials();
void sync_objects(BL::SpaceView3D b_v3d);
void sync_film();
- void sync_integrator(int layer);
+ void sync_integrator(const char *layer);
void sync_view();
void sync_world();
void sync_render_layers(BL::SpaceView3D b_v3d);
@@ -110,6 +110,7 @@
material_override(PointerRNA_NULL)
{}
+ string name;
uint scene_layer;
uint layer;
BL::Material material_override;
Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h 2012-02-08 05:45:16 UTC (rev 43977)
@@ -368,12 +368,13 @@
#else
label = svm_bsdf_sample(sd, sc, randu, randv, &eval, omega_in, domega_in, pdf);
#endif
+ if(*pdf != 0.0f) {
+ bsdf_eval_init(bsdf_eval, sc->type, eval*sc->weight, kernel_data.film.use_light_pass);
- bsdf_eval_init(bsdf_eval, sc->type, eval*sc->weight, kernel_data.film.use_light_pass);
-
- if(sd->num_closure > 1 && *pdf != 0.0f) {
- float sweight = sc->sample_weight;
- _shader_bsdf_multi_eval(sd, *omega_in, pdf, sampled, bsdf_eval, *pdf*sweight, sweight);
+ if(sd->num_closure > 1) {
+ float sweight = sc->sample_weight;
+ _shader_bsdf_multi_eval(sd, *omega_in, pdf, sampled, bsdf_eval, *pdf*sweight, sweight);
+ }
}
return label;
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h 2012-02-08 05:45:16 UTC (rev 43977)
@@ -84,8 +84,9 @@
__device float floorfrac(float x, int* i)
{
- *i = quick_floor(x);
- return x - *i;
+ float f = floorf(x);
+ *i = (int)f;
+ return x - f;
}
__device float fade(float t)
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918,43935-43976
Modified: branches/bmesh/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2012-02-08 05:45:16 UTC (rev 43977)
@@ -327,9 +327,6 @@
_sys_path_ensure(path)
-_presets = _os.path.join(_scripts[0], "presets") # FIXME - multiple paths
-
-
def preset_paths(subdir):
"""
Returns a list of paths for a specific preset.
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/anim_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/anim_utils.py 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/anim_utils.py 2012-02-08 05:45:16 UTC (rev 43977)
@@ -158,7 +158,7 @@
# -------------------------------------------------------------------------
# Create action
- # in case animation data hassnt been created
+ # in case animation data hasn't been created
atd = obj.animation_data_create()
if action is None:
action = bpy.data.actions.new("Action")
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-02-08 05:20:23 UTC (rev 43976)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-02-08 05:45:16 UTC (rev 43977)
@@ -166,7 +166,7 @@
flipped = False
while 1:
- # from knowing the last 2, look for th next.
+ # from knowing the last 2, look for the next.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list