[Bf-blender-cvs] [6eff1cb] soc-2013-viewport_fx: Merge branch 'soc-2014-viewport' into soc-2013-viewport_fx
Jason Wilkins
noreply at git.blender.org
Thu May 29 05:21:08 CEST 2014
Commit: 6eff1cbebcf0766d2fe69db9b0fb3f76ede2c06b
Author: Jason Wilkins
Date: Wed May 21 19:02:02 2014 -0500
https://developer.blender.org/rB6eff1cbebcf0766d2fe69db9b0fb3f76ede2c06b
Merge branch 'soc-2014-viewport' into soc-2013-viewport_fx
Conflicts:
intern/cycles/device/device_cuda.cpp
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_translation.c
source/blender/blenkernel/BKE_brush.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/include/ED_armature.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/area.c
source/blender/editors/screen/glutil.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/sculpt_intern.h
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_clip/clip_dopesheet_draw.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_graph_draw.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_info/textview.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawanimviz.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_subwindow.c
source/blender/windowmanager/intern/wm_window.c
===================================================================
===================================================================
diff --cc build_files/build_environment/install_deps.sh
index 1fadf98,4fa7946..4fa7946
mode 100755,100755..100644
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
diff --cc build_files/build_environment/prepare_release_env.sh
index 9889fea,f003507..f003507
mode 100755,100755..100644
--- a/build_files/build_environment/prepare_release_env.sh
+++ b/build_files/build_environment/prepare_release_env.sh
diff --cc build_files/cmake/cmake_consistency_check.py
index c2044fc,c2044fc..c2044fc
mode 100755,100755..100644
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
diff --cc build_files/cmake/cmake_netbeans_project.py
index 17490e3,17668f1..17668f1
mode 100755,100755..100644
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
diff --cc build_files/cmake/cmake_qtcreator_project.py
index 4cf854a,76f1efa..76f1efa
mode 100755,100755..100644
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
diff --cc build_files/cmake/example_scripts/cmake_linux_install.sh
index 6ef5074,34bbe10..34bbe10
mode 100755,100755..100644
--- a/build_files/cmake/example_scripts/cmake_linux_install.sh
+++ b/build_files/cmake/example_scripts/cmake_linux_install.sh
diff --cc build_files/cmake/example_scripts/make_quicky.py
index 76d4df3,76d4df3..76d4df3
mode 100755,100755..100644
--- a/build_files/cmake/example_scripts/make_quicky.py
+++ b/build_files/cmake/example_scripts/make_quicky.py
diff --cc build_files/cmake/example_scripts/make_quiet.sh
index 9e17920,9e17920..9e17920
mode 100755,100755..100644
--- a/build_files/cmake/example_scripts/make_quiet.sh
+++ b/build_files/cmake/example_scripts/make_quiet.sh
diff --cc build_files/cmake/project_info.py
index 5d756a6,fcd4501..fcd4501
mode 100755,100755..100644
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
diff --cc build_files/package_spec/build_archive.py
index 0329d16,0329d16..0329d16
mode 100755,100755..100644
--- a/build_files/package_spec/build_archive.py
+++ b/build_files/package_spec/build_archive.py
diff --cc build_files/package_spec/build_debian.sh
index 4594095,4594095..4594095
mode 100755,100755..100644
--- a/build_files/package_spec/build_debian.sh
+++ b/build_files/package_spec/build_debian.sh
diff --cc build_files/package_spec/debian/rules
index 7a3d2d5,7a3d2d5..7a3d2d5
mode 100755,100755..100644
--- a/build_files/package_spec/debian/rules
+++ b/build_files/package_spec/debian/rules
diff --cc doc/blender_file_format/BlendFileDnaExporter_25.py
index 837b67c,837b67c..837b67c
mode 100755,100755..100644
--- a/doc/blender_file_format/BlendFileDnaExporter_25.py
+++ b/doc/blender_file_format/BlendFileDnaExporter_25.py
diff --cc doc/python_api/sphinx_doc_gen.sh
index e6ff02a,e6ff02a..e6ff02a
mode 100755,100755..100644
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
diff --cc extern/Eigen3/eigen-update.sh
index 7be6789,1cf0337..1cf0337
mode 100755,100755..100644
--- a/extern/Eigen3/eigen-update.sh
+++ b/extern/Eigen3/eigen-update.sh
diff --cc extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
index aff9f27,aff9f27..aff9f27
mode 100755,100755..100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
diff --cc extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
index 57ebb47,57ebb47..57ebb47
mode 100755,100755..100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
diff --cc extern/carve/bundle.sh
index 91d5f44,2a3e621..2a3e621
mode 100755,100755..100644
--- a/extern/carve/bundle.sh
+++ b/extern/carve/bundle.sh
diff --cc extern/carve/mkfiles.sh
index bd02266,bd02266..bd02266
mode 100755,100755..100644
--- a/extern/carve/mkfiles.sh
+++ b/extern/carve/mkfiles.sh
diff --cc extern/libmv/bundle.sh
index 48d6843,e8e698a..e8e698a
mode 100755,100755..100644
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
diff --cc extern/libmv/mkfiles.sh
index c7c8c33,c7c8c33..c7c8c33
mode 100755,100755..100644
--- a/extern/libmv/mkfiles.sh
+++ b/extern/libmv/mkfiles.sh
diff --cc extern/libmv/third_party/ceres/bundle.sh
index d937ed4,7cb6b9b..7cb6b9b
mode 100755,100755..100644
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
diff --cc extern/libmv/third_party/ceres/mkfiles.sh
index d335829,d335829..d335829
mode 100755,100755..100644
--- a/extern/libmv/third_party/ceres/mkfiles.sh
+++ b/extern/libmv/third_party/ceres/mkfiles.sh
diff --cc extern/libmv/third_party/glog/src/windows/preprocess.sh
index ea4352e,ea4352e..ea4352e
mode 100755,100755..100644
--- a/extern/libmv/third_party/glog/src/windows/preprocess.sh
+++ b/extern/libmv/third_party/glog/src/windows/preprocess.sh
diff --cc intern/cycles/device/device_cuda.cpp
index 107ca16,6895521..93b89dc
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@@ -951,11 -994,13 +994,15 @@@ public
glPopMatrix();
+ if(draw_params.unbind_display_space_shader_cb) {
+ draw_params.unbind_display_space_shader_cb();
+ }
+
- if(transparent)
+ if(transparent) {
glDisable(GL_BLEND);
-
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); /* reset blender default */
+ }
+
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
diff --cc release/bin/blender-softwaregl
index 8628dca,8628dca..8628dca
mode 100755,100755..100644
--- a/release/bin/blender-softwaregl
+++ b/release/bin/blender-softwaregl
diff --cc release/bin/blender-thumbnailer.py
index 22e811c,779c615..779c615
mode 100755,100755..100644
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
diff --cc release/datafiles/blender_icons_update.py
index ec753c5,ec753c5..ec753c5
mode 100755,100755..100644
--- a/release/datafiles/blender_icons_update.py
+++ b/release/datafiles/blender_icons_update.py
diff --cc release/datafiles/ctodata.py
index a81a101,a81a101..a81a101
mode 100755,100755..100644
--- a/release/datafiles/ctodata.py
+++ b/release/datafiles/ctodata.py
diff --cc release/datafiles/datatoc.py
index f1fce08,f1fce08..f1fce08
mode 100755,100755..100644
--- a/release/datafiles/datatoc.py
+++ b/release/datafiles/datatoc.py
diff --cc release/datafiles/prvicons_update.py
index ecc466a,ecc466a..ecc466a
mode 100755,100755..100644
--- a/release/datafiles/prvicons_update.py
+++ b/release/datafiles/prvicons_update.py
diff --cc release/scripts/modules/bl_i18n_utils/merge_po.py
index d7dade2,d7dade2..d7dade2
mode 100755,100755..100644
--- a/release/scripts/modules/bl_i18n_utils/merge_po.py
+++ b/release/scripts/modules/bl_i18n_utils/merge_po.py
diff --cc release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
index 24255d9,24255d9..24255d9
mode 100755,100755..100644
--- a/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
diff --cc release/scripts/modules/bl_i18n_utils/utils_rtl.py
index 261d154,261d154..261d154
mode 100755,100755..100644
--- a/release/scripts/modules/bl_i18n_utils/utils_rtl.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_rtl.py
diff --cc release/scripts/modules/blend_render_info.py
index a62eaee,a62eaee..a62eaee
mode 100755,100755..100644
--- a/release/scripts/modules/blend_render_info.py
+++ b/release/scripts/modules/blend_render_info.py
diff --cc source/blender/blenfont/intern/blf_font.c
index 4cb8d74,2bdae87..6bc5cd3
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@@ -54,9 -54,8 +54,7 @@@
#include "BLI_string_utf8.h"
#include "BLI_threads.h"
#include "BLI_alloca.h"
- #include "BLI_linklist.h" /* linknode */
- #include "BLI_strict_flags.h"
-#include "BIF_gl.h"
#include "BLF_api.h"
#include "IMB_colormanagement.h"
@@@ -64,9 -63,8 +62,11 @@@
#include "blf_internal_types.h"
#include "blf_internal.h"
+ #include "BLI_strict_flags.h"
+
+#include "GPU_immediate.h"
+#include "GPU_state_latch.h"
+
/* freetype2 handle ONLY for this file!. */
static FT_Library ft_lib;
static SpinLock ft_lib_mutex;
diff --cc source/blender/blenfont/intern/blf_translation.c
index 0a288e0,150ff1b..9f166e8
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@@ -52,13 -52,13 +52,13 @@@
static const char unifont_filename[] = "droidsans.ttf.gz";
static unsigned char *unifont_ttf = NULL;
-static int unifont_size = 0;
+static bli_off_t unifont_size = 0;
static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
static unsigned char *unifont_mono_ttf = NULL;
-static int unifont_mono_size = 0;
+static bli_off_t unifont_mono_size = 0;
#endif /* WITH_INTERNATIONAL */
- unsigned char *BLF_get_unifont(int *unifont_size_r)
+ unsigned char *BLF_get_unifont(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@@ -75,7 -75,7 +75,7 @@@
}
}
- *unifont_size_r = (int)unifont_size; /* assuming font file is less than 2GiB */
- *r_unifont_size = unifont_size;
++ *r_unifont_size = (int)unifont_size; /* XXX jwilkins: assuming font file is less than 2GiB */
return unifont_ttf;
#else
diff --cc source/blender/blenkernel/BKE_animsys.h
index 675c044,80d2750..a2ad845
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@@ -111,10 -111,10 +111,10 @@@ void BKE_action_fix_paths_rename(struc
/* Fix all the paths for the given ID+AnimData */
void BKE_animdata_fix_paths_rename(struct ID *owner_id, struct AnimData *adt, struct ID *ref_id, const char *prefix,
const char *oldName, const char *newName, int oldSubscript, int newSubscript,
- int verify_paths);
+ bool verify_paths);
/* Fix all the paths for the entire database... */
-void BKE_all_animdata_fix_paths_rename(ID *re
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list