[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61454] trunk/lib/windows_vc12/llvm /debug: LLVM 3.4.2 windows xp vc120 msvc2013 debug libraries
Revision: 61454 https://developer.blender.org/rBL61454 Author: juicyfruit Date: 2014-11-25 07:34:05 + (Tue, 25 Nov 2014) Log Message: --- LLVM 3.4.2 windows xp vc120 msvc2013 debug libraries Added Paths: --- trunk/lib/windows_vc12/llvm/debug/ trunk/lib/windows_vc12/llvm/debug/bin/ trunk/lib/windows_vc12/llvm/debug/bin/bugpoint.exe trunk/lib/windows_vc12/llvm/debug/bin/clang++.exe trunk/lib/windows_vc12/llvm/debug/bin/clang-check.exe trunk/lib/windows_vc12/llvm/debug/bin/clang-cl.exe trunk/lib/windows_vc12/llvm/debug/bin/clang-format.exe trunk/lib/windows_vc12/llvm/debug/bin/clang.exe trunk/lib/windows_vc12/llvm/debug/bin/git-clang-format trunk/lib/windows_vc12/llvm/debug/bin/libclang.dll trunk/lib/windows_vc12/llvm/debug/bin/llc.exe trunk/lib/windows_vc12/llvm/debug/bin/lli-child-target.exe trunk/lib/windows_vc12/llvm/debug/bin/lli.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-ar.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-as.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-bcanalyzer.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-c-test.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-config.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-cov.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-diff.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-dis.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-dwarfdump.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-extract.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-link.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-lto.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-mc.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-mcmarkup.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-nm.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-objdump.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-readobj.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-rtdyld.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-size.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-stress.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-symbolizer.exe trunk/lib/windows_vc12/llvm/debug/bin/llvm-tblgen.exe trunk/lib/windows_vc12/llvm/debug/bin/macho-dump.exe trunk/lib/windows_vc12/llvm/debug/bin/opt.exe trunk/lib/windows_vc12/llvm/debug/include/ trunk/lib/windows_vc12/llvm/debug/include/clang/ trunk/lib/windows_vc12/llvm/debug/include/clang/ARCMigrate/ trunk/lib/windows_vc12/llvm/debug/include/clang/ARCMigrate/ARCMT.h trunk/lib/windows_vc12/llvm/debug/include/clang/ARCMigrate/ARCMTActions.h trunk/lib/windows_vc12/llvm/debug/include/clang/ARCMigrate/FileRemapper.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ trunk/lib/windows_vc12/llvm/debug/include/clang/AST/APValue.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/AST.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTConsumer.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTContext.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTDiagnostic.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTFwd.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTImporter.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTLambda.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTMutationListener.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTTypeTraits.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTUnresolvedSet.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/ASTVector.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/Attr.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/AttrDump.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/AttrImpl.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/AttrIterator.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/Attrs.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/BaseSubobject.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/BuiltinTypes.def trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CXXInheritance.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CanonicalType.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CharUnits.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/Comment.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentBriefParser.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentCommandInfo.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentCommandList.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentCommandTraits.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentDiagnostic.h trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentHTMLNamedCharacterReferences.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentHTMLTags.inc trunk/lib/windows_vc12/llvm/debug/include/clang/AST/CommentHTMLTagsProperties.inc
[Bf-blender-cvs] [435eaa7] master: Draw world background in offscreen OpenGL renders when. Use forced rendering in that case, not user preference also set alpha to 1.0 (transparent drawing just clears
Commit: 435eaa79b26c1b72287dd78df3ae7a1d79db3d32
Author: Antony Riakiotakis
Date: Mon Nov 24 23:03:48 2014 +0100
Branches: master
https://developer.blender.org/rB435eaa79b26c1b72287dd78df3ae7a1d79db3d32
Draw world background in offscreen OpenGL renders when. Use forced
rendering in that case, not user preference also set alpha to 1.0
(transparent drawing just clears to zero)
===
M source/blender/editors/space_view3d/view3d_draw.c
===
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index d681915..d4a0c01 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2801,6 +2801,179 @@ void ED_view3d_draw_offscreen_init(Scene *scene, View3D
*v3d)
gpu_update_lamps_shadows(scene, v3d);
}
+/*
+ * Function to clear the view
+ */
+static void view3d_main_area_clear(Scene *scene, View3D *v3d, ARegion *ar,
bool force)
+{
+ /* clear background */
+ if (scene->world && ((v3d->flag3 & V3D_SHOW_WORLD) || force)) { /*
clear with solid color */
+ float alpha = (force) ? 1.0f : 0.0;
+
+ if (scene->world->skytype & WO_SKYBLEND) { /* blend sky */
+ int x, y;
+ float col_hor[3];
+ float col_zen[3];
+
+#define VIEWGRAD_RES_X 16
+#define VIEWGRAD_RES_Y 16
+
+ GLubyte grid_col[VIEWGRAD_RES_X][VIEWGRAD_RES_Y][4];
+ static float
grid_pos[VIEWGRAD_RES_X][VIEWGRAD_RES_Y][3];
+ static GLushort indices[VIEWGRAD_RES_X -
1][VIEWGRAD_RES_X - 1][4];
+ static bool buf_calculated = false;
+
+ IMB_colormanagement_pixel_to_display_space_v3(col_hor,
&scene->world->horr, &scene->view_settings,
+
&scene->display_settings);
+ IMB_colormanagement_pixel_to_display_space_v3(col_zen,
&scene->world->zenr, &scene->view_settings,
+
&scene->display_settings);
+
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+
+ glShadeModel(GL_SMOOTH);
+
+ /* calculate buffers the first time only */
+ if (!buf_calculated) {
+ for (x = 0; x < VIEWGRAD_RES_X; x++) {
+ for (y = 0; y < VIEWGRAD_RES_Y; y++) {
+ const float xf = (float)x /
(float)(VIEWGRAD_RES_X - 1);
+ const float yf = (float)y /
(float)(VIEWGRAD_RES_Y - 1);
+
+ /* -1..1 range */
+ grid_pos[x][y][0] = (xf - 0.5f)
* 2.0f;
+ grid_pos[x][y][1] = (yf - 0.5f)
* 2.0f;
+ grid_pos[x][y][2] = 1.0;
+ }
+ }
+
+ for (x = 0; x < VIEWGRAD_RES_X - 1; x++) {
+ for (y = 0; y < VIEWGRAD_RES_Y - 1;
y++) {
+ indices[x][y][0] = x *
VIEWGRAD_RES_X + y;
+ indices[x][y][1] = x *
VIEWGRAD_RES_X + y + 1;
+ indices[x][y][2] = (x + 1) *
VIEWGRAD_RES_X + y + 1;
+ indices[x][y][3] = (x + 1) *
VIEWGRAD_RES_X + y;
+ }
+ }
+
+ buf_calculated = true;
+ }
+
+ for (x = 0; x < VIEWGRAD_RES_X; x++) {
+ for (y = 0; y < VIEWGRAD_RES_Y; y++) {
+ const float xf = (float)x /
(float)(VIEWGRAD_RES_X - 1);
+ const float yf = (float)y /
(float)(VIEWGRAD_RES_Y - 1);
+ const float mval[2] = {xf *
(float)ar->winx, yf * ar->winy};
+ const float z_up[3] = {0.0f, 0.0f,
1.0f};
+ float out[3];
+ GLubyte *col_ub = grid_col[x][y];
+
+ float col_fac;
+ float col_fl[3];
+
+
[Bf-blender-cvs] [d7a3238] master: Audaspace: File handle management for audio sequencing
Commit: d7a32383c0867a3f8b90792fd1fee01e13349481
Author: Jörg Müller
Date: Tue Nov 25 10:45:31 2014 +1300
Branches: master
https://developer.blender.org/rBd7a32383c0867a3f8b90792fd1fee01e13349481
Audaspace: File handle management for audio sequencing
Fixes the problem that for big sequences too many file handles were open at the
same time.
Changes the playback handles that the audio sequencing code manages to be
closed and reopened when needed. The metric used is the current playback
position in relation to the strip. If the strip is more than 10 seconds
(configurable) away from the playback cursor, the handle is released and
reopened when needed.
See D915.
===
M intern/audaspace/intern/AUD_SequencerHandle.cpp
M intern/audaspace/intern/AUD_SequencerHandle.h
===
diff --git a/intern/audaspace/intern/AUD_SequencerHandle.cpp
b/intern/audaspace/intern/AUD_SequencerHandle.cpp
index 135c960..56cfa0d 100644
--- a/intern/audaspace/intern/AUD_SequencerHandle.cpp
+++ b/intern/audaspace/intern/AUD_SequencerHandle.cpp
@@ -31,18 +31,92 @@
#include "AUD_ReadDevice.h"
#include "AUD_MutexLock.h"
+#define KEEP_TIME 10
+
+void AUD_SequencerHandle::start()
+{
+ // we already tried to start, aborting
+ if(!m_valid)
+ return;
+
+ // in case the sound is playing, we need to stop first
+ stop();
+
+ AUD_MutexLock lock(*m_entry);
+
+ // let's try playing
+ if(m_entry->m_sound.get())
+ {
+ m_handle = m_device.play(m_entry->m_sound, true);
+ m_3dhandle =
boost::dynamic_pointer_cast(m_handle);
+
+ // after starting we have to set the properties, so let's
ensure that
+ m_status--;
+ }
+
+ // if the sound could not be played, we invalidate
+ m_valid = m_handle.get();
+}
+
+bool AUD_SequencerHandle::updatePosition(float position)
+{
+ AUD_MutexLock lock(*m_entry);
+
+ if(m_handle.get())
+ {
+ // we currently have a handle, let's check where we are
+ if(position >= m_entry->m_end)
+ {
+ if(position >= m_entry->m_end + KEEP_TIME)
+ // far end, stopping
+ stop();
+ else
+ {
+ // close end, just pausing
+ m_handle->pause();
+ return true;
+ }
+ }
+ else if(position >= m_entry->m_begin)
+ {
+ // inside, resuming
+ m_handle->resume();
+ return true;
+ }
+ else
+ {
+ if(position < m_entry->m_begin - KEEP_TIME)
+ // far beginning, stopping
+ stop();
+ else
+ {
+ // close beginning, just pausing
+ m_handle->pause();
+ return true;
+ }
+ }
+ }
+ else
+ {
+ // we don't have a handle, let's start if we should be playing
+ if(position >= m_entry->m_begin && position <= m_entry->m_end)
+ {
+ start();
+ return m_valid;
+ }
+ }
+
+ return false;
+}
+
AUD_SequencerHandle::AUD_SequencerHandle(boost::shared_ptr
entry, AUD_ReadDevice& device) :
m_entry(entry),
+ m_valid(true),
m_status(0),
m_pos_status(0),
m_sound_status(0),
m_device(device)
{
- if(entry->m_sound.get())
- {
- m_handle = device.play(entry->m_sound, true);
- m_3dhandle =
boost::dynamic_pointer_cast(m_handle);
- }
}
AUD_SequencerHandle::~AUD_SequencerHandle()
@@ -63,101 +137,116 @@ void AUD_SequencerHandle::stop()
{
if(m_handle.get())
m_handle->stop();
+ m_handle = boost::shared_ptr();
+ m_3dhandle = boost::shared_ptr();
}
void AUD_SequencerHandle::update(float position, float frame, float fps)
{
- if(m_handle.get())
+ if(m_sound_status != m_entry->m_sound_status)
{
- AUD_MutexLock lock(*m_entry);
- if(position >= m_entry->m_end)
- m_handle->pause();
- else if(position >= m_entry->m_begin)
- m_handle->resume();
-
- if(m_sound_status != m_entry->m_sound_status)
- {
- if(m_handle.get())
- m_handle->stop();
+ // if a new sound has been set, it's possible
[Bf-blender-cvs] [e3b68db] master: Freestyle: Py-Hooks for custom pre/post-processing line style
Commit: e3b68dbaf809a2370926ecc5739c28f80c0c1310
Author: Tamito Kajiyama
Date: Mon Nov 24 22:41:34 2014 +0100
Branches: master
https://developer.blender.org/rBe3b68dbaf809a2370926ecc5739c28f80c0c1310
Freestyle: Py-Hooks for custom pre/post-processing line style
Patch D839, needed for SVG-render to be made into an addon.
===
M release/scripts/freestyle/modules/parameter_editor.py
===
diff --git a/release/scripts/freestyle/modules/parameter_editor.py
b/release/scripts/freestyle/modules/parameter_editor.py
index 9ac5c66..aad470e 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -97,7 +97,7 @@ from freestyle.utils import (
stroke_normal,
bound,
pairwise,
-BoundedProperty
+BoundedProperty,
)
from _freestyle import (
blendRamp,
@@ -110,6 +110,12 @@ from mathutils import Vector
from math import pi, sin, cos, acos, radians
from itertools import cycle, tee
+# lists of callback functions
+# WARNING: highly experimental, not a stable API
+callbacks_lineset_pre = []
+callbacks_modifiers_post = []
+callbacks_lineset_post = []
+
class ColorRampModifier(StrokeShader):
"""Primitive for the color modifiers."""
@@ -878,6 +884,21 @@ class Seed:
_seed = Seed()
+def get_dashed_pattern(linestyle):
+"""Extracts the dashed pattern from the various UI options """
+pattern = []
+if linestyle.dash1 > 0 and linestyle.gap1 > 0:
+pattern.append(linestyle.dash1)
+pattern.append(linestyle.gap1)
+if linestyle.dash2 > 0 and linestyle.gap2 > 0:
+pattern.append(linestyle.dash2)
+pattern.append(linestyle.gap2)
+if linestyle.dash3 > 0 and linestyle.gap3 > 0:
+pattern.append(linestyle.dash3)
+pattern.append(linestyle.gap3)
+return pattern
+
+
integration_types = {
'MEAN': IntegrationType.MEAN,
'MIN': IntegrationType.MIN,
@@ -887,13 +908,19 @@ integration_types = {
# main function for parameter processing
-
def process(layer_name, lineset_name):
scene = getCurrentScene()
layer = scene.render.layers[layer_name]
lineset = layer.freestyle_settings.linesets[lineset_name]
linestyle = lineset.linestyle
+# execute line set pre-processing callback functions
+for fn in callbacks_lineset_pre:
+try:
+fn(scene, layer, lineset)
+except Exception as e:
+print(e)
+
selection_criteria = []
# prepare selection criteria by visibility
if lineset.select_by_visibility:
@@ -1172,24 +1199,26 @@ def process(layer_name, lineset_name):
has_tex = True
if has_tex:
shaders_list.append(StrokeTextureStepShader(linestyle.texture_spacing))
+
+# execute post-base stylization callbacks
+for fn in callbacks_modifiers_post:
+shaders_list.extend(fn(scene, layer, lineset))
+
# -- Stroke caps -- #
if linestyle.caps == 'ROUND':
shaders_list.append(RoundCapShader())
elif linestyle.caps == 'SQUARE':
shaders_list.append(SquareCapShader())
+
# -- Dashed line -- #
if linestyle.use_dashed_line:
-pattern = []
-if linestyle.dash1 > 0 and linestyle.gap1 > 0:
-pattern.append(linestyle.dash1)
-pattern.append(linestyle.gap1)
-if linestyle.dash2 > 0 and linestyle.gap2 > 0:
-pattern.append(linestyle.dash2)
-pattern.append(linestyle.gap2)
-if linestyle.dash3 > 0 and linestyle.gap3 > 0:
-pattern.append(linestyle.dash3)
-pattern.append(linestyle.gap3)
+pattern = get_dashed_pattern(linestyle)
if len(pattern) > 0:
shaders_list.append(DashedLineShader(pattern))
+
# create strokes using the shaders list
Operators.create(TrueUP1D(), shaders_list)
+
+# execute line set post-processing callback functions
+for fn in callbacks_lineset_post:
+fn(scene, layer, lineset)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3e59626] input_method_editor: Merge remote-tracking branch 'origin/master' into ime
Commit: 3e5962656a3778a9d8e6eca02f11284636880633 Author: Severin Date: Mon Nov 24 22:19:53 2014 +0100 Branches: input_method_editor https://developer.blender.org/rB3e5962656a3778a9d8e6eca02f11284636880633 Merge remote-tracking branch 'origin/master' into ime Conflicts: source/blender/editors/space_node/node_add.c source/blender/editors/space_text/text_draw.c source/blender/editors/space_view3d/view3d_edit.c === === ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61453] trunk/lib/windows_vc12/osl: OSL 1.5.11 + sergey alignment fix msvc 2013 x86 v120_xp
Revision: 61453 https://developer.blender.org/rBL61453 Author: juicyfruit Date: 2014-11-24 21:14:42 + (Mon, 24 Nov 2014) Log Message: --- OSL 1.5.11 + sergey alignment fix msvc 2013 x86 v120_xp Modified Paths: -- trunk/lib/windows_vc12/osl/include/OSL/oslexec.h trunk/lib/windows_vc12/osl/include/OSL/oslversion.h trunk/lib/windows_vc12/osl/lib/libtestshade.lib trunk/lib/windows_vc12/osl/lib/oslcomp.lib trunk/lib/windows_vc12/osl/lib/oslexec.lib trunk/lib/windows_vc12/osl/lib/oslquery.lib Modified: trunk/lib/windows_vc12/osl/include/OSL/oslexec.h === --- trunk/lib/windows_vc12/osl/include/OSL/oslexec.h2014-11-24 20:40:07 UTC (rev 61452) +++ trunk/lib/windows_vc12/osl/include/OSL/oslexec.h2014-11-24 21:14:42 UTC (rev 61453) @@ -234,9 +234,9 @@ /// int num_textures_neededThe number of texture names that are ///known to be potentially needed by the ///group (after optimization). -/// string textures_needed[] The names of the textures known to be -///needed. Must be of length at least as -///long as num_textures_needed. +/// ptr textures_neededRetrieves a pointer to the ustring array +///containing all textures known to be +///needed. /// int unknown_textures_needed Nonzero if additional textures may be ///needed, whose names can't be known ///without actually running the shader. @@ -418,7 +418,8 @@ std::string getstats (int level=1) const; void register_closure (string_view name, int id, const ClosureParam *params, - PrepareClosureFunc prepare, SetupClosureFunc setup); + PrepareClosureFunc prepare, SetupClosureFunc setup, + int alignment = 1); /// Query either by name or id an existing closure. If name is non /// NULL it will use it for the search, otherwise id would be used /// and the name will be placed in name if successful. Also return Modified: trunk/lib/windows_vc12/osl/include/OSL/oslversion.h === --- trunk/lib/windows_vc12/osl/include/OSL/oslversion.h 2014-11-24 20:40:07 UTC (rev 61452) +++ trunk/lib/windows_vc12/osl/include/OSL/oslversion.h 2014-11-24 21:14:42 UTC (rev 61453) @@ -43,7 +43,7 @@ // Version of this library: #define OSL_LIBRARY_VERSION_MAJOR 1 #define OSL_LIBRARY_VERSION_MINOR 5 -#define OSL_LIBRARY_VERSION_PATCH 10 +#define OSL_LIBRARY_VERSION_PATCH 11 #define OSL_LIBRARY_VERSION_RELEASE_TYPE #define OSL_LIBRARY_VERSION_CODE (1 * OSL_LIBRARY_VERSION_MAJOR + \ Modified: trunk/lib/windows_vc12/osl/lib/libtestshade.lib === (Binary files differ) Modified: trunk/lib/windows_vc12/osl/lib/oslcomp.lib === (Binary files differ) Modified: trunk/lib/windows_vc12/osl/lib/oslexec.lib === (Binary files differ) Modified: trunk/lib/windows_vc12/osl/lib/oslquery.lib === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61452] trunk/lib/win64_vc12/osl/ lib: OSL 1.5.11 msvc 2013 debug libraries
Revision: 61452 https://developer.blender.org/rBL61452 Author: juicyfruit Date: 2014-11-24 20:40:07 + (Mon, 24 Nov 2014) Log Message: --- OSL 1.5.11 msvc 2013 debug libraries Added Paths: --- trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib trunk/lib/win64_vc12/osl/lib/oslexec_d.lib trunk/lib/win64_vc12/osl/lib/oslquery_d.lib Added: trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib === (Binary files differ) Index: trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib === --- trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib 2014-11-24 20:10:26 UTC (rev 61451) +++ trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib 2014-11-24 20:40:07 UTC (rev 61452) Property changes on: trunk/lib/win64_vc12/osl/lib/libtestshade_d.lib ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib === (Binary files differ) Index: trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib === --- trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib 2014-11-24 20:10:26 UTC (rev 61451) +++ trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib 2014-11-24 20:40:07 UTC (rev 61452) Property changes on: trunk/lib/win64_vc12/osl/lib/oslcomp_d.lib ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/win64_vc12/osl/lib/oslexec_d.lib === (Binary files differ) Index: trunk/lib/win64_vc12/osl/lib/oslexec_d.lib === --- trunk/lib/win64_vc12/osl/lib/oslexec_d.lib 2014-11-24 20:10:26 UTC (rev 61451) +++ trunk/lib/win64_vc12/osl/lib/oslexec_d.lib 2014-11-24 20:40:07 UTC (rev 61452) Property changes on: trunk/lib/win64_vc12/osl/lib/oslexec_d.lib ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lib/win64_vc12/osl/lib/oslquery_d.lib === (Binary files differ) Index: trunk/lib/win64_vc12/osl/lib/oslquery_d.lib === --- trunk/lib/win64_vc12/osl/lib/oslquery_d.lib 2014-11-24 20:10:26 UTC (rev 61451) +++ trunk/lib/win64_vc12/osl/lib/oslquery_d.lib 2014-11-24 20:40:07 UTC (rev 61452) Property changes on: trunk/lib/win64_vc12/osl/lib/oslquery_d.lib ___ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c35f563] master: Separate sequence extension drawing routine so it can be reused (as part of an option or for tools)
Commit: c35f563bb7faddcfa46caf17248a487b315dabeb
Author: Antony Riakiotakis
Date: Mon Nov 24 21:11:05 2014 +0100
Branches: master
https://developer.blender.org/rBc35f563bb7faddcfa46caf17248a487b315dabeb
Separate sequence extension drawing routine so it can be reused (as part
of an option or for tools)
===
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
===
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 1235ba8..80e3a02 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -597,6 +597,111 @@ void draw_shadedstrip(Sequence *seq, unsigned char
col[3], float x1, float y1, f
}
}
+void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq)
+{
+ float x1, x2, y1, y2, pixely, a;
+ unsigned char col[3], blendcol[3];
+ View2D *v2d = &ar->v2d;
+
+ x1 = seq->startdisp;
+ x2 = seq->enddisp;
+
+ y1 = seq->machine + SEQ_STRIP_OFSBOTTOM;
+ y2 = seq->machine + SEQ_STRIP_OFSTOP;
+
+ pixely = BLI_rctf_size_y(&v2d->cur) / BLI_rcti_size_y(&v2d->mask);
+
+ if (pixely <= 0) return; /* can happen when the view is split/resized
*/
+
+ blendcol[0] = blendcol[1] = blendcol[2] = 120;
+
+ if (seq->startofs) {
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ color3ubv_from_seq(scene, seq, col);
+
+ if (seq->flag & SELECT) {
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3,
-40);
+ glColor4ub(col[0], col[1], col[2], 170);
+ }
+ else {
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6,
0);
+ glColor4ub(col[0], col[1], col[2], 110);
+ }
+
+ glRectf((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);
+
+ if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
+ else glColor4ub(col[0], col[1], col[2], 160);
+
+ fdrawbox((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1,
y1); //outline
+
+ glDisable(GL_BLEND);
+ }
+ if (seq->endofs) {
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ color3ubv_from_seq(scene, seq, col);
+
+ if (seq->flag & SELECT) {
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3,
-40);
+ glColor4ub(col[0], col[1], col[2], 170);
+ }
+ else {
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6,
0);
+ glColor4ub(col[0], col[1], col[2], 110);
+ }
+
+ glRectf(x2, y2, (float)(seq->start + seq->len), y2 +
SEQ_STRIP_OFSBOTTOM);
+
+ if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
+ else glColor4ub(col[0], col[1], col[2], 160);
+
+ fdrawbox(x2, y2, (float)(seq->start + seq->len), y2 +
SEQ_STRIP_OFSBOTTOM); //outline
+
+ glDisable(GL_BLEND);
+ }
+ if (seq->startstill) {
+ color3ubv_from_seq(scene, seq, col);
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
+ glColor3ubv((GLubyte *)col);
+
+ draw_shadedstrip(seq, col, x1, y1, (float)(seq->start), y2);
+
+ /* feint pinstripes, helps see exactly which is extended and
which isn't,
+* especially when the extension is very small */
+ if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col,
col, 0.0, 24);
+ else UI_GetColorPtrShade3ubv(col, col, -16);
+
+ glColor3ubv((GLubyte *)col);
+
+ for (a = y1; a < y2; a += pixely * 2.0f) {
+ fdrawline(x1, a, (float)(seq->start), a);
+ }
+ }
+ if (seq->endstill) {
+ color3ubv_from_seq(scene, seq, col);
+ UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
+ glColor3ubv((GLubyte *)col);
+
+ draw_shadedstrip(seq, col, (float)(seq->start + seq->len), y1,
x2, y2);
+
+ /* feint pinstri
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61451] trunk/lib/win64_vc12/osl: OSL bump to 1.5.11 + sergey alignfix
Revision: 61451 https://developer.blender.org/rBL61451 Author: juicyfruit Date: 2014-11-24 20:10:26 + (Mon, 24 Nov 2014) Log Message: --- OSL bump to 1.5.11 + sergey alignfix Modified Paths: -- trunk/lib/win64_vc12/osl/include/OSL/oslexec.h trunk/lib/win64_vc12/osl/include/OSL/oslversion.h trunk/lib/win64_vc12/osl/lib/libtestshade.lib trunk/lib/win64_vc12/osl/lib/oslcomp.lib trunk/lib/win64_vc12/osl/lib/oslexec.lib trunk/lib/win64_vc12/osl/lib/oslquery.lib Modified: trunk/lib/win64_vc12/osl/include/OSL/oslexec.h === --- trunk/lib/win64_vc12/osl/include/OSL/oslexec.h 2014-11-24 18:08:13 UTC (rev 61450) +++ trunk/lib/win64_vc12/osl/include/OSL/oslexec.h 2014-11-24 20:10:26 UTC (rev 61451) @@ -234,9 +234,9 @@ /// int num_textures_neededThe number of texture names that are ///known to be potentially needed by the ///group (after optimization). -/// string textures_needed[] The names of the textures known to be -///needed. Must be of length at least as -///long as num_textures_needed. +/// ptr textures_neededRetrieves a pointer to the ustring array +///containing all textures known to be +///needed. /// int unknown_textures_needed Nonzero if additional textures may be ///needed, whose names can't be known ///without actually running the shader. @@ -418,7 +418,8 @@ std::string getstats (int level=1) const; void register_closure (string_view name, int id, const ClosureParam *params, - PrepareClosureFunc prepare, SetupClosureFunc setup); + PrepareClosureFunc prepare, SetupClosureFunc setup, + int alignment = 1); /// Query either by name or id an existing closure. If name is non /// NULL it will use it for the search, otherwise id would be used /// and the name will be placed in name if successful. Also return Modified: trunk/lib/win64_vc12/osl/include/OSL/oslversion.h === --- trunk/lib/win64_vc12/osl/include/OSL/oslversion.h 2014-11-24 18:08:13 UTC (rev 61450) +++ trunk/lib/win64_vc12/osl/include/OSL/oslversion.h 2014-11-24 20:10:26 UTC (rev 61451) @@ -43,7 +43,7 @@ // Version of this library: #define OSL_LIBRARY_VERSION_MAJOR 1 #define OSL_LIBRARY_VERSION_MINOR 5 -#define OSL_LIBRARY_VERSION_PATCH 10 +#define OSL_LIBRARY_VERSION_PATCH 11 #define OSL_LIBRARY_VERSION_RELEASE_TYPE #define OSL_LIBRARY_VERSION_CODE (1 * OSL_LIBRARY_VERSION_MAJOR + \ Modified: trunk/lib/win64_vc12/osl/lib/libtestshade.lib === (Binary files differ) Modified: trunk/lib/win64_vc12/osl/lib/oslcomp.lib === (Binary files differ) Modified: trunk/lib/win64_vc12/osl/lib/oslexec.lib === (Binary files differ) Modified: trunk/lib/win64_vc12/osl/lib/oslquery.lib === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [b00a943] master: UI: avoid property lookup for uiItemMenuEnumR
Commit: b00a943fe835b4dd24cb5443aa02c5fc09d7e96c
Author: Campbell Barton
Date: Mon Nov 24 21:03:00 2014 +0100
Branches: master
https://developer.blender.org/rBb00a943fe835b4dd24cb5443aa02c5fc09d7e96c
UI: avoid property lookup for uiItemMenuEnumR
===
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_layout.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index 0d045f8..b479215 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -945,6 +945,7 @@ void uiItemS(uiLayout *layout); /* separator */
void uiItemMenuF(uiLayout *layout, const char *name, int icon,
uiMenuCreateFunc func, void *arg);
void uiItemMenuEnumO(uiLayout *layout, struct bContext *C, const char *opname,
const char *propname, const char *name, int icon);
+void uiItemMenuEnumR_prop(uiLayout *layout, struct PointerRNA *ptr,
PropertyRNA *prop, const char *name, int icon);
void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char
*propname, const char *name, int icon);
/* UI Operators */
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 2d952d6..7a8d2af 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1922,17 +1922,9 @@ static void menu_item_enum_rna_menu(bContext *UNUSED(C),
uiLayout *layout, void
layout->root->block->flag |= UI_BLOCK_IS_FLIP;
}
-void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char
*propname, const char *name, int icon)
+void uiItemMenuEnumR_prop(uiLayout *layout, struct PointerRNA *ptr,
PropertyRNA *prop, const char *name, int icon)
{
MenuItemLevel *lvl;
- PropertyRNA *prop;
-
- prop = RNA_struct_find_property(ptr, propname);
- if (!prop) {
- ui_item_disabled(layout, propname);
- RNA_warning("property not found: %s.%s",
RNA_struct_identifier(ptr->type), propname);
- return;
- }
if (!name)
name = RNA_property_ui_name(prop);
@@ -1941,12 +1933,26 @@ void uiItemMenuEnumR(uiLayout *layout, struct
PointerRNA *ptr, const char *propn
lvl = MEM_callocN(sizeof(MenuItemLevel), "MenuItemLevel");
lvl->rnapoin = *ptr;
- BLI_strncpy(lvl->propname, propname, sizeof(lvl->propname));
+ BLI_strncpy(lvl->propname, RNA_property_identifier(prop),
sizeof(lvl->propname));
lvl->opcontext = layout->root->opcontext;
ui_item_menu(layout, name, icon, menu_item_enum_rna_menu, NULL, lvl,
RNA_property_description(prop), false);
}
+void uiItemMenuEnumR(uiLayout *layout, struct PointerRNA *ptr, const char
*propname, const char *name, int icon)
+{
+ PropertyRNA *prop;
+
+ prop = RNA_struct_find_property(ptr, propname);
+ if (!prop) {
+ ui_item_disabled(layout, propname);
+ RNA_warning("property not found: %s.%s",
RNA_struct_identifier(ptr->type), propname);
+ return;
+ }
+
+ uiItemMenuEnumR_prop(layout, ptr, prop, name, icon);
+}
+
/ Layout Items ***/
/* single-row layout */
diff --git a/source/blender/makesrna/intern/rna_ui_api.c
b/source/blender/makesrna/intern/rna_ui_api.c
index 33c3531..4f889c9 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -137,9 +137,7 @@ static void rna_uiItemMenuEnumR(uiLayout *layout, struct
PointerRNA *ptr, const
/* Get translated name (label). */
name = rna_translate_ui_text(name, text_ctxt, NULL, prop, translate);
-
- /* XXX This will search property again :( */
- uiItemMenuEnumR(layout, ptr, propname, name, icon);
+ uiItemMenuEnumR_prop(layout, ptr, prop, name, icon);
}
static void rna_uiItemEnumR_string(uiLayout *layout, struct PointerRNA *ptr,
const char *propname, const char *value,
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 606409e..ccdf082 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -502,6 +502,7 @@ struct uiLayout *uiLayoutSplit(uiLayout *layout, float
percentage, int align) RE
bool uiLayoutGetRedAlert(struct uiLayout *layout) RET_ZERO
void uiLayoutSetRedAlert(uiLayout *layout, bool redalert) RET_NONE
void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char
*propname) RET_NONE
+void uiItemMenuEnumR_prop(uiLayout *layout, struct PointerRNA *pt
[Bf-blender-cvs] [aae1162] wiggly-widgets: Merge branch 'master' into wiggly-widgets
Commit: aae11629451a070c9e17cdb109b5ffabb4dc3684
Author: Antony Riakiotakis
Date: Mon Nov 24 19:22:15 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBaae11629451a070c9e17cdb109b5ffabb4dc3684
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
===
===
diff --cc source/blender/editors/space_view3d/view3d_edit.c
index e504050,20488e5..07b04e9
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -4296,18 -4350,12 +4350,12 @@@ static int background_image_add_invoke(
}
bgpic = background_image_add(C);
+ bgpic->ima = ima;
- if (ima) {
- bgpic->ima = ima;
-
- id_us_plus(&ima->id);
-
- if (!(v3d->flag & V3D_DISPBGPICS))
- v3d->flag |= V3D_DISPBGPICS;
- }
-
+ v3d->flag |= V3D_DISPBGPICS;
+
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
-
+
return OPERATOR_FINISHED;
}
@@@ -4327,10 -4375,11 +4375,11 @@@ void VIEW3D_OT_background_image_add(wmO
/* flags */
ot->flag = 0;
-
+
/* properties */
RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name",
"Image name to assign");
- RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath",
"Path to image file");
+ WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE,
FILE_SPECIAL, FILE_OPENFILE,
+ WM_FILESEL_FILEPATH |
WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
}
diff --cc source/blender/editors/space_view3d/view3d_ops.c
index 71c3256,5df3484..499a13c
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@@ -76,10 -77,10 +77,10 @@@ static int view3d_copybuffer_exec(bCont
BKE_copybuffer_tag_ID(&ob->id);
}
CTX_DATA_END;
-
- BLI_make_file_string("/", str, BLI_temp_dir_base(), "copybuffer.blend");
+
+ BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
BKE_copybuffer_save(str, op->reports);
-
+
BKE_report(op->reports, RPT_INFO, "Copied selected objects to buffer");
return OPERATOR_FINISHED;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61450] trunk/lib/ darwin-9.x.universal/release/python_i386.zip: OSX: replace numpy with correct arch in 32bit zip
Revision: 61450 https://developer.blender.org/rBL61450 Author: jensverwiebe Date: 2014-11-24 18:08:13 + (Mon, 24 Nov 2014) Log Message: --- OSX:replace numpy with correct arch in 32bit zip Modified Paths: -- trunk/lib/darwin-9.x.universal/release/python_i386.zip Modified: trunk/lib/darwin-9.x.universal/release/python_i386.zip === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61449] trunk/lib/ darwin-9.x.universal/release/python_i386.zip: OSX: 32bit, update to Python 3.4.2 with numpy 1.9.1
Revision: 61449 https://developer.blender.org/rBL61449 Author: jensverwiebe Date: 2014-11-24 18:04:03 + (Mon, 24 Nov 2014) Log Message: --- OSX: 32bit, update to Python 3.4.2 with numpy 1.9.1 Modified Paths: -- trunk/lib/darwin-9.x.universal/release/python_i386.zip Modified: trunk/lib/darwin-9.x.universal/release/python_i386.zip === (Binary files differ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61448] trunk/lib/ darwin-9.x.universal: OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1
Revision: 61448
https://developer.blender.org/rBL61448
Author: jensverwiebe
Date: 2014-11-24 17:56:55 + (Mon, 24 Nov 2014)
Log Message:
---
OSX: 64bit, update to Python 3.4.2 with numpy 1.9.1
Modified Paths:
--
trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/pytime.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/sysmodule.h
trunk/lib/darwin-9.x.universal/python/include/python3.4m/unicodeobject.h
trunk/lib/darwin-9.x.universal/python/lib/python3.4/libpython3.4m.a
trunk/lib/darwin-9.x.universal/release/python_x86_64.zip
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/abstract.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -1021,7 +1021,7 @@
PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
/*
- Returns the sequence, o, as a list, unless it's already a
+ Return the sequence, o, as a list, unless it's already a
tuple or list. Use PySequence_Fast_GET_ITEM to access the
members of this list, and PySequence_Fast_GET_SIZE to get its length.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/codecs.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -49,6 +49,10 @@
PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
const char *encoding
);
+
+PyAPI_FUNC(int) _PyCodec_Forget(
+ const char *encoding
+ );
#endif
/* Codec registry encoding check API.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/listobject.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -46,7 +46,7 @@
PyAPI_DATA(PyTypeObject) PySortWrapper_Type;
#define PyList_Check(op) \
- PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
+PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type)
PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/objimpl.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -265,7 +265,7 @@
#define _PyGCHead_REFS(g) ((g)->gc.gc_refs >> _PyGC_REFS_SHIFT)
#define _PyGCHead_SET_REFS(g, v) do { \
(g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK) \
-| (v << _PyGC_REFS_SHIFT); \
+| (((size_t)(v)) << _PyGC_REFS_SHIFT); \
} while (0)
#define _PyGCHead_DECREF(g) ((g)->gc.gc_refs -= 1 << _PyGC_REFS_SHIFT)
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/python/include/python3.4m/patchlevel.h
2014-11-24 17:56:55 UTC (rev 61448)
@@ -18,12 +18,12 @@
/*--start constants--*/
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 4
-#define PY_MICRO_VERSION 0
+#define PY_MICRO_VERSION 2
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.4.0"
+#define PY_VERSION "3.4.2"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Modified: trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
===
--- trunk/lib/darwin-9.x.universal/python/include/python3.4m/pyconfig.h
2014-11-24 16:44:44 UTC (rev 61447)
+++ trunk/lib/darwin-9.x.universal/pytho
[Bf-blender-cvs] [649a2bc] master: Politically correct terrible consequencer changes
Commit: 649a2bcc3d51cfc6f9fc237695015c87bcca7deb
Author: Antony Riakiotakis
Date: Mon Nov 24 18:18:35 2014 +0100
Branches: master
https://developer.blender.org/rB649a2bcc3d51cfc6f9fc237695015c87bcca7deb
Politically correct terrible consequencer changes
This patch includes the work done in the terrible consequencer branch
that hasn't been merged to master minus a few controversial and WIP
stuff, like strip parenting, new sequence data structs and cuddly
widgets.
What is included:
* Strip extensions only when slipping. It can very easily be made an
option but with a few strips with overlapping durations it makes view
too crowded and difficult to make out.
* Threaded waveform loading + code that restores waveforms on undo (not
used though, since sound_load recreates everything. There's a patch for
review D876)
* Toggle to enable backdrop in the strip sequence editor
* Toggle to easily turn on/off waveform display
* Snapping during transform on sequence boundaries. Snapping to start or
end of selection depends on position of mouse when invoking the operator
* Snapping of timeline indicator in sequencer to strip boundaries. To
use just press and hold ctrl while dragging.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D904
===
M intern/audaspace/intern/AUD_C-API.cpp
M intern/audaspace/intern/AUD_C-API.h
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_sound.h
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenloader/intern/readblenentry.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/space_sequencer/CMakeLists.txt
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_ops.c
A source/blender/editors/space_sequencer/sequencer_preview.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_snap.c
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_sound_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_sound.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/windowmanager/WM_api.h
===
diff --git a/intern/audaspace/intern/AUD_C-API.cpp
b/intern/audaspace/intern/AUD_C-API.cpp
index d2a9347..45d72cc 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include "AUD_NULLDevice.h"
#include "AUD_I3DDevice.h"
@@ -317,8 +318,9 @@ AUD_SoundInfo AUD_getInfo(AUD_Sound *sound)
info.length = reader->getLength() / (float)
info.specs.rate;
}
}
- catch(AUD_Exception&)
+ catch(AUD_Exception &ae)
{
+ std::cout << ae.str << std::endl;
}
return info;
@@ -1084,7 +1086,7 @@ int AUD_doesPlayback()
return -1;
}
-int AUD_readSound(AUD_Sound *sound, sample_t *buffer, int length, int
samples_per_second)
+int AUD_readSound(AUD_Sound *sound, sample_t *buffer, int length, int
samples_per_second, short *interrupt)
{
AUD_DeviceSpecs specs;
sample_t *buf;
@@ -1107,6 +1109,9 @@ int AUD_readSound(AUD_Sound *sound, sample_t *buffer, int
length, int samples_pe
for (int i = 0; i < length; i++) {
len = floor(samplejump * (i+1)) - floor(samplejump * i);
+ if (*interrupt) {
+ return 0;
+ }
aBuffer.assureSize(len * AUD_SAMPLE_SIZE(specs));
buf = aBuffer.getBuffer();
diff --git a/intern/audaspace/intern/AUD_C-API.h
b/intern/audaspace/intern/AUD_C-API.h
index 64a3d06..657d4e6 100644
--- a/intern/audaspace/intern/AUD_C-API.h
+++ b/intern/audaspace/intern/AUD_C-API.h
@@ -646,7 +646,7 @@ extern int AUD_doesPlayback(void);
* \param samples_per_second How many samples to read per second of the sound.
* \return How many samples really have been read. Always <= length.
*/
-extern int AUD_readSound(AUD_Sound *sound, sample_t *buffer, int length, int
samples_per_second);
+extern int AUD_readSound(AUD_Sound *sound, sample_t *buffer, int
[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61447] trunk/lib/ darwin-9.x.universal/osl: OSX: Update OSL to 1.5.11 with our alignment fixes applied
Revision: 61447 https://developer.blender.org/rBL61447 Author: sergey Date: 2014-11-24 16:44:44 + (Mon, 24 Nov 2014) Log Message: --- OSX: Update OSL to 1.5.11 with our alignment fixes applied Modified Paths: -- trunk/lib/darwin-9.x.universal/osl/CHANGES trunk/lib/darwin-9.x.universal/osl/README.md trunk/lib/darwin-9.x.universal/osl/bin/oslc trunk/lib/darwin-9.x.universal/osl/bin/oslinfo trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso trunk/lib/darwin-9.x.universal/osl/shaders/image.oso trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso Modified: trunk/lib/darwin-9.x.universal/osl/CHANGES === --- trunk/lib/darwin-9.x.universal/osl/CHANGES 2014-11-19 19:27:14 UTC (rev 61446) +++ trunk/lib/darwin-9.x.universal/osl/CHANGES 2014-11-24 16:44:44 UTC (rev 61447) @@ -1,5 +1,20 @@ + +Release 1.5.11 -- 22 Sep 2014 (compared to 1.5.10) +-- +* Windows compilations fixes for very MSVC 2013. +* Windows build fix for compiling shaders finding the right oslc.exe. + #399 +* Speedup from telling gcc/clang to ignore the fact that math functions + can set errno (helps code generation of sqrtf in particular. +* Fix thread contention issue in testshade which could make it hard to + use testshade as a benchmark with many threads. +* Make it build properly with LLVM 3.5. +* Fix compiler warnings about signed/unsigned comparisons. + + + Release 1.5 -- July 30, 2014 (compared to 1.4) --- +-- Language, standard libary, and compiler changes (for shader writers): * New closure function for microfacet BSDFs: closure color microfacet (string distribution, normal N, @@ -248,6 +263,8 @@ shader that rely on userdata. #395 (1.5.10) * Fixes for Boost 1.55 + Linux combination, where it needed -lrt on the link line. #394 (1.5.10) +* Windows build fix for compiling shaders finding the right oslc.exe. + #399 (1.5.11) Documentation: * Clarified docs about floor(). (1.5.8) Modified: trunk/lib/darwin-9.x.universal/osl/README.md === --- trunk/lib/darwin-9.x.universal/osl/README.md2014-11-19 19:27:14 UTC (rev 61446) +++ trunk/lib/darwin-9.x.universal/osl/README.md2014-11-24 16:44:44 UTC (rev 61447) @@ -324,9 +324,10 @@ * Brecht Van Lommel Additionally, many others have contributed fixes and other small -changes: Shane Ambler, Sven-Hendrik Haase, Erich Ocean, Mikko Ohtamaa, -Alex Schworer, Alexander von Knorring. (Listed alphabetically; if we've -left anybody out, please let us know.) +changes: Shane Ambler, Martijn Berger, Matthaus G. Chajdas, Thomas +Dinges, Sven-Hendrik Haase, Ronan Keryell, Bastien Montagne, Erich +Ocean, Mikko Ohtamaa, Alex Schworer, Alexander von Knorring. (Listed +alphabetically; if we've left anybody out, please let us know.) We cannot possibly express sufficient gratitude to the managers at Sony Pictures Imageworks who allowed this project to proceed, supported it Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslc === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslinfo === (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h === --- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h2014-11-19 19:27:14 UTC (rev 61446) +++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h2014-11-24 16:44:44 UTC (rev 61447) @@ -234,9 +234,9 @@ /// int num_textures_neededThe number of texture names that are ///known to be potentially needed by the ///group (after optimization). -/// string textures_needed[] The names of the textures known to be -///needed. Must be of length at least as -///long as num_textures_needed. +/// ptr textures_neededRetrieves a pointer to the ustring array +///containing all textures known to be +///needed. /// int unknown_textur
[Bf-blender-cvs] [aa0b268] master: Fix T42710: Use string length for ID user buttons
Commit: aa0b268acbf352bdf69644bb11ee3b893008cc40
Author: Severin
Date: Mon Nov 24 17:24:07 2014 +0100
Branches: master
https://developer.blender.org/rBaa0b268acbf352bdf69644bb11ee3b893008cc40
Fix T42710: Use string length for ID user buttons
===
M source/blender/editors/interface/interface_templates.c
===
diff --git a/source/blender/editors/interface/interface_templates.c
b/source/blender/editors/interface/interface_templates.c
index 95cb36a..56ff705 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -473,11 +473,12 @@ static void template_ID(bContext *C, uiLayout *layout,
TemplateID *template, Str
if (id->us > 1) {
char numstr[32];
+ short numstr_len;
- BLI_snprintf(numstr, sizeof(numstr), "%d", id->us);
+ numstr_len = BLI_snprintf(numstr, sizeof(numstr), "%d",
id->us);
- but = uiDefBut(block, UI_BTYPE_BUT, 0, numstr, 0, 0,
UI_UNIT_X + ((id->us < 10) ? 0 : 10), UI_UNIT_Y,
- NULL, 0, 0, 0, 0,
+ but = uiDefBut(block, UI_BTYPE_BUT, 0, numstr, 0, 0,
+ numstr_len * 0.2f * UI_UNIT_X +
UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0,
TIP_("Display number of users of this
data (click to make a single-user copy)"));
but->flag |= UI_BUT_UNDO;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c890d60] fracture_modifier: cluster breaking angle, distance, percentage added, rename contact distance to search radius, jump back to start frame of rigidbody cache now automaticall
Commit: c890d60651a8d42b97a41b3019aae3eb1869e2e7
Author: Martin Felke
Date: Mon Nov 24 16:36:27 2014 +0100
Branches: fracture_modifier
https://developer.blender.org/rBc890d60651a8d42b97a41b3019aae3eb1869e2e7
cluster breaking angle, distance, percentage added, rename contact distance to
search radius, jump back to start frame of rigidbody cache now automatically at
fracture time (or frame 1)
===
M release/scripts/startup/bl_ui/properties_physics_fracture.py
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/editors/object/object_modifier.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_fracture.c
===
diff --git a/release/scripts/startup/bl_ui/properties_physics_fracture.py
b/release/scripts/startup/bl_ui/properties_physics_fracture.py
index 919ee6e..5a32eaa 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fracture.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fracture.py
@@ -129,16 +129,21 @@ class PHYSICS_PT_fracture_simulation(PhysicButtonsPanel,
Panel):
box.prop(md, "percentage")
box.label("Constraint Breaking Settings")
col = box.column(align=True)
-row = col.row()
+row = col.row(align=True)
row.prop(md, "breaking_percentage", text="Percentage")
-row.prop(md, "breaking_percentage_weighted")
+row.prop(md, "cluster_breaking_percentage", text="Cluster
Percentage")
-row = col.row()
+row = col.row(align=True)
row.prop(md, "breaking_angle", text="Angle")
-row.prop(md, "breaking_angle_weighted")
+row.prop(md, "cluster_breaking_angle", text="Cluster Angle")
-row = col.row()
+row = col.row(align=True)
row.prop(md, "breaking_distance", text="Distance")
+row.prop(md, "cluster_breaking_distance", text="Cluster Distance")
+
+row = col.row(align=True)
+row.prop(md, "breaking_percentage_weighted")
+row.prop(md, "breaking_angle_weighted")
row.prop(md, "breaking_distance_weighted")
col = box.column(align=True)
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index b87d2d2..bb401dc 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -2670,7 +2670,7 @@ static void rigidbody_update_simulation(Scene *scene,
RigidBodyWorld *rbw, bool
int breaking_percentage =
rmd->breaking_percentage_weighted ? (rmd->breaking_percentage * weight) :
rmd->breaking_percentage;
if (rmd->breaking_percentage >
0 || (rmd->breaking_percentage_weighted && weight > 0)) {
- int broken_cons = 0,
cons = 0, i = 0;
+ int broken_cons = 0,
cons = 0, i = 0, cluster_cons = 0, broken_cluster_cons = 0;
RigidBodyShardCon *con;
cons =
mi->participating_constraint_count;
@@ -2678,11 +2678,41 @@ static void rigidbody_update_simulation(Scene *scene,
RigidBodyWorld *rbw, bool
for (i = 0; i < cons;
i++) {
con =
mi->participating_constraints[i];
if (con &&
con->physics_constraint) {
+ if
(rmd->cluster_breaking_percentage > 0)
+ {
+
/*only count as broken if between clusters!*/
+
if (con->mi1->particle_index != con->mi2->particle_index)
+
{
+
cluster_cons++;
+
+
if (!RB_constraint_is_enabled(con->physics_constraint)) {
+
broken_cluster_cons++;
+
}
+
[Bf-blender-cvs] [1b10900] multiview: cleanup & use STREQ macro
Commit: 1b1090081b3334e2499c46bed9e1a5d1eba0ce5f
Author: Campbell Barton
Date: Mon Nov 24 16:30:13 2014 +0100
Branches: multiview
https://developer.blender.org/rB1b1090081b3334e2499c46bed9e1a5d1eba0ce5f
cleanup & use STREQ macro
===
M intern/cycles/blender/addon/ui.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/makesrna/intern/rna_render.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/render/intern/source/render_result.c
===
diff --git a/intern/cycles/blender/addon/ui.py
b/intern/cycles/blender/addon/ui.py
index 97acb6e..a5accfa 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -430,7 +430,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
layout.active = rd.use_multiple_views
-basic_stereo = rd.views_setup == 'SETUP_BASIC'
+basic_stereo = (rd.views_setup == 'SETUP_BASIC')
row = layout.row()
row.prop(rd, "views_setup", expand=True)
@@ -452,7 +452,7 @@ class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
col.operator("scene.render_view_remove", icon='ZOOMOUT', text="")
row = layout.row()
-if rv and rv.name not in ('left', 'right'):
+if rv and rv.name not in {"left", "right"}:
row.prop(rv, "name")
row = layout.row()
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py
b/release/scripts/startup/bl_ui/properties_data_camera.py
index 5b78681..d177e80 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -125,16 +125,14 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel,
Panel):
@classmethod
def poll(cls, context):
-scene = context.scene
-
-multiview = scene.render.use_multiple_views
-engine = scene.render.engine
-
-return context.camera and multiview and (engine in cls.COMPAT_ENGINES)
+render = context.scene.render
+return (super().poll(context) and render.use_multiple_views)
def draw(self, context):
layout = self.layout
-layout.active = context.scene.render.views_setup == 'STEREO_3D'
+render = context.scene.render
+
+layout.active = (render.views_setup == 'STEREO_3D')
col = layout.column()
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py
b/release/scripts/startup/bl_ui/properties_render_layer.py
index 213438f..6f970d0 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -168,13 +168,14 @@ class RENDERLAYER_UL_renderviews(UIList):
# assert(isinstance(item, bpy.types.SceneRenderView)
view = item
if self.layout_type in {'DEFAULT', 'COMPACT'}:
-if view.name in ('left', 'right', 'Left', 'Right'): #XXX MV remove
left, right when I implement the ui names capitalized
+# XXX MV remove left, right when I implement the ui names
capitalized
+if view.name in {'left', 'right', 'Left', 'Right'}:
layout.label(view.name, icon_value=icon + (not view.use))
else:
layout.prop(view, "name", text="", index=index,
icon_value=icon, emboss=False)
layout.prop(view, "use", text="", index=index)
-elif self.layout_type in {'GRID'}:
+elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
layout.label("", icon_value=icon + (not view.use))
diff --git a/release/scripts/startup/bl_ui/space_image.py
b/release/scripts/startup/bl_ui/space_image.py
index 6c7046b..edfbc7d 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -682,9 +682,11 @@ class IMAGE_PT_stereo_3d_properties(Panel):
@classmethod
def poll(cls, context):
sima = context.space_data
-image = sima.image if sima else None
-return (sima and image and image.type == 'IMAGE' and \
-context.scene.render.use_multiple_views)
+if sima:
+image = sima.image
+return (image and image.type == 'IMAGE' and
+context.scene.render.use_multiple_views)
+return False
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py
b/release/scripts/startup/bl_ui/space_sequencer.py
index 19ab875..1c1f7ef 100644
--- a/release/script
[Bf-blender-cvs] [8e2b30f] fracture_modifier: rename "Initial Particle Coordinates" to "Particle Birth Coordinates"
Commit: 8e2b30f1ebffe6bb5014d1c9c6615891bfb426f8 Author: Martin Felke Date: Mon Nov 24 16:39:23 2014 +0100 Branches: fracture_modifier https://developer.blender.org/rB8e2b30f1ebffe6bb5014d1c9c6615891bfb426f8 rename "Initial Particle Coordinates" to "Particle Birth Coordinates" === M source/blender/makesrna/intern/rna_modifier.c === diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index de2eec2..4c5b229 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -4032,7 +4032,7 @@ static void rna_def_modifier_fracture(BlenderRNA *brna) prop = RNA_def_property(srna, "use_particle_birth_coordinates", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_particle_birth_coordinates", false); - RNA_def_property_ui_text(prop, "Use Initial Particle Coordinates", "Use initial or simulated state particle coordinates"); + RNA_def_property_ui_text(prop, "Use Particle Birth Coordinates", "Use birth or simulated state particle coordinates"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "splinter_axis", PROP_ENUM, PROP_NONE); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [a517667] multiview: From review: small changes
Commit: a5176676b8119465091c6e3956ea0a3d07fe96a7
Author: Dalai Felinto
Date: Mon Nov 24 11:41:30 2014 -0200
Branches: multiview
https://developer.blender.org/rBa5176676b8119465091c6e3956ea0a3d07fe96a7
>From review: small changes
* Remove double promotion as suggested on review
* Remove extra space and lines in python file
* Undo unecessary change in BKE_camera_object_dof_distance
* Rename stereo_3d operator to set_stereo_3d
* Remove unused variable in python
* Remove unecessary include
===
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/intern/camera.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/wm.h
===
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py
b/release/scripts/startup/bl_ui/properties_render_layer.py
index 6fb4d54..213438f 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -180,7 +180,7 @@ class RENDERLAYER_UL_renderviews(UIList):
class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
-bl_label = "Views"
+bl_label = "Views"
COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw_header(self, context):
@@ -194,7 +194,6 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
rd = scene.render
rv = rd.views.active
-
layout.active = rd.use_multiple_views
basic_stereo = rd.views_setup == 'STEREO_3D'
diff --git a/release/scripts/startup/bl_ui/space_info.py
b/release/scripts/startup/bl_ui/space_info.py
index 62498f0..2688557 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -270,7 +270,7 @@ class INFO_MT_window(Menu):
layout.operator("wm.console_toggle", icon='CONSOLE')
layout.separator()
-layout.operator("wm.stereo_3d", icon='CAMERA_STEREO')
+layout.operator("wm.set_stereo_3d", icon='CAMERA_STEREO')
class INFO_MT_help(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 3f32ff9..197765e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2866,8 +2866,6 @@ class VIEW3D_PT_view3d_stereo(Panel):
scene = context.scene
multiview = scene.render.use_multiple_views
-engine = scene.render.engine
-
return context.space_data and multiview
def draw(self, context):
diff --git a/source/blender/blenkernel/BKE_camera.h
b/source/blender/blenkernel/BKE_camera.h
index c14f3de..d2f79de 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -36,7 +36,6 @@
extern "C" {
#endif
-#include "DNA_scene_types.h"
#include "DNA_vec_types.h"
struct Camera;
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index e5ee54a..4340d66 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -71,8 +71,8 @@ void *BKE_camera_add(Main *bmain, const char *name)
cam->passepartalpha = 0.5f;
/* stereoscopy 3d */
- cam->stereo.interocular_distance = 0.065;
- cam->stereo.convergence_distance = 30.f * 0.065;
+ cam->stereo.interocular_distance = 0.065f;
+ cam->stereo.convergence_distance = 30.f * 0.065f;
return cam;
}
@@ -156,7 +156,7 @@ void BKE_camera_object_mode(RenderData *rd, Object *cam_ob)
/* get the camera's dof value, takes the dof object into account */
float BKE_camera_object_dof_distance(Object *ob)
{
- Camera *cam = ob->data;
+ Camera *cam = (Camera *)ob->data;
if (ob->type != OB_CAMERA)
return 0.0f;
if (cam->dof_ob) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 1fad150..49ae9a4 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4705,20 +4705,20 @@ static void operatortype_ghash_free_cb(wmOperatorType
*ot)
/* *** */
/* toggle 3D for current window, turning it fullscreen if needed */
-static void WM_OT_stereo3d(wmOperatorType *ot)
+static void WM_OT_set_stereo3d(wmOperatorType *ot)
{
PropertyRNA *prop;
- ot->name = "Stereo 3D";
- ot->idname = "WM_OT_stereo_3d";
+ ot->name = "Set Stereo 3D";
+ ot->idname = "WM_OT_set_stereo_3d";
ot->description = "
[Bf-blender-cvs] [d92985c] hair_system: Merge branch 'gooseberry' into hair_system
Commit: d92985cfc9e040bf6c079f5848974ba76153f827
Author: Lukas Tönne
Date: Mon Nov 24 16:28:24 2014 +0100
Branches: hair_system
https://developer.blender.org/rBd92985cfc9e040bf6c079f5848974ba76153f827
Merge branch 'gooseberry' into hair_system
Conflicts:
source/blender/blenkernel/intern/rigidbody.c
===
===
diff --cc intern/cycles/blender/blender_curves.cpp
index c81c243,f010a24..8d7dbcc
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@@ -550,8 -554,9 +551,9 @@@ void ExportParticleCurveTriangleGeometr
/* texture coords still needed */
}
-void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CData)
+static void ExportParticleCurveSegments(Scene *scene, Mesh *mesh,
ParticleCurveData *CData)
{
+ VLOG(1) << "Exporting curve segments for mesh " << mesh->name;
int num_keys = 0;
int num_curves = 0;
@@@ -618,8 -623,11 +620,11 @@@
}
}
-static void ExportCurveSegmentsMotion(Scene *scene, Mesh *mesh,
ParticleCurveData *CData, int time_index)
+static void ExportParticleCurveSegmentsMotion(Scene *scene, Mesh *mesh,
ParticleCurveData *CData, int time_index)
{
+ VLOG(1) << "Exporting curve motion segments for mesh " << mesh->name
+ << ", time index " << time_index;
+
/* find attribute */
Attribute *attr_mP =
mesh->curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
bool new_attribute = false;
diff --cc source/blender/blenkernel/intern/rigidbody.c
index 0ea00a9,4b8f60d..2e422f3
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@@ -710,22 -1158,16 +710,22 @@@ static void rigidbody_update_ob_array(R
GroupObject *go;
int i, n;
- n = BLI_listbase_count(&rbw->group->gobject);
-
- if (rbw->numbodies != n) {
- rbw->numbodies = n;
- rbw->objects = realloc(rbw->objects, sizeof(Object *) *
rbw->numbodies);
+ if (rbw->group) {
- n = BLI_countlist(&rbw->group->gobject);
++ n = BLI_listbase_count(&rbw->group->gobject);
+
+ if (rbw->numbodies != n) {
+ rbw->numbodies = n;
+ rbw->objects = realloc(rbw->objects, sizeof(Object *) *
rbw->numbodies);
+ }
+
+ for (go = rbw->group->gobject.first, i = 0; go; go = go->next,
i++) {
+ Object *ob = go->ob;
+ rbw->objects[i] = ob;
+ }
}
-
- for (go = rbw->group->gobject.first, i = 0; go; go = go->next, i++) {
- Object *ob = go->ob;
- rbw->objects[i] = ob;
+ else {
+ rbw->numbodies = 0;
+ rbw->objects = NULL;
}
}
@@@ -835,7 -1499,7 +835,7 @@@ void BKE_rigidbody_rebuild_world(Scene
cache = rbw->pointcache;
/* flag cache as outdated if we don't have a world or number of objects
in the simulation has changed */
- if (rbw->physics_world == NULL || (rbw->group && rbw->numbodies !=
BLI_countlist(&rbw->group->gobject))) {
- if (rbw->physics_world == NULL || rbw->numbodies !=
BLI_listbase_count(&rbw->group->gobject)) {
++ if (rbw->physics_world == NULL || (rbw->group && rbw->numbodies !=
BLI_listbase_count(&rbw->group->gobject))) {
cache->flag |= PTCACHE_OUTDATED;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [62a8079] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor
Commit: 62a8079165cae6ae9e98c8135fd903aff0eddcb5 Author: Sergey Sharybin Date: Mon Nov 24 19:18:21 2014 +0500 Branches: depsgraph_refactor https://developer.blender.org/rB62a8079165cae6ae9e98c8135fd903aff0eddcb5 Merge branch 'master' into depsgraph_refactor === === ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9311a5b] master: Cycles: Speedup BVH build for certain compilers
Commit: 9311a5be04b66411442e4e2b99b3211a06d7e326
Author: Sergey Sharybin
Date: Mon Nov 24 17:18:02 2014 +0500
Branches: master
https://developer.blender.org/rB9311a5be04b66411442e4e2b99b3211a06d7e326
Cycles: Speedup BVH build for certain compilers
The issue was noticed with gcc-4.7 (used by the release build environment)
which didn't generate optimal enough code for BVH references swap. Seems it
looked up for the assign operator for each of the reference structure members
even though nothing special was required for assignment.
Forcing compiler to use simple memory copy gives speedup of like 2-3 times.
The issue doesn't happen with OSX's clang and new gcc-4.9, but since we're
gonna to stick to gcc-4.7 for official releases for quite some time still it's
nice to have performance issues resolved for all the compilers.
Didn't put the code into #ifdef so if in the future some issues appears with
alignment or assignment which need to happen as an operator we notice this
earlier.
===
M intern/cycles/bvh/bvh_params.h
===
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index e073b69..43c2d9b 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -115,6 +115,11 @@ public:
__forceinline int prim_object() const { return
__float_as_int(rbounds.max.w); }
__forceinline int prim_type() const { return type; }
+ BVHReference& operator=(const BVHReference &arg) {
+ memcpy(this, &arg, sizeof(BVHReference));
+ return *this;
+ }
+
protected:
BoundBox rbounds;
uint type;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c114919] master: Cycles: Log time spent on the BVH build
Commit: c1149198b5983f13bfd9bc21263b0e278e07da94 Author: Sergey Sharybin Date: Mon Nov 24 15:08:13 2014 +0500 Branches: master https://developer.blender.org/rBc1149198b5983f13bfd9bc21263b0e278e07da94 Cycles: Log time spent on the BVH build === M intern/cycles/bvh/bvh_build.cpp === diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index eb4cca9..06549de 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -28,6 +28,7 @@ #include "util_debug.h" #include "util_foreach.h" +#include "util_logging.h" #include "util_progress.h" #include "util_time.h" @@ -223,7 +224,8 @@ BVHNode* BVHBuild::run() spatial_right_bounds.resize(max(root.size(), (int)BVHParams::NUM_SPATIAL_BINS) - 1); /* init progress updates */ - progress_start_time = time_dt(); + double build_start_time; + build_start_time = progress_start_time = time_dt(); progress_count = 0; progress_total = references.size(); progress_original_total = progress_total; @@ -258,6 +260,10 @@ BVHNode* BVHBuild::run() } } + VLOG(1) << "BVH built in " + << time_dt() - build_start_time + << " seconds."; + return rootnode; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0085c3c] master: Typo fix (not related to previous drumroll)
Commit: 0085c3c5e53f6ff520463b77d2aca68f3f7471e6
Author: Antony Riakiotakis
Date: Mon Nov 24 14:48:20 2014 +0100
Branches: master
https://developer.blender.org/rB0085c3c5e53f6ff520463b77d2aca68f3f7471e6
Typo fix (not related to previous drumroll)
===
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index c9708df..990697f 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -794,7 +794,7 @@ class VIEW3D_PT_imapaint_tools_missing(Panel,
View3DPaintPanel):
if toolsettings.missing_uvs:
col.separator()
col.label("Missing UVs", icon='INFO')
-col.label("Unwrap the mesh in edit mode or generate a simple UVs")
+col.label("Unwrap the mesh in edit mode or generate a simple UV
layer")
col.operator("paint.add_simple_uvs")
if toolsettings.mode == 'MATERIAL':
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fae3850] master: Allow explicit control over world background.
Commit: fae385029394159428799ef0ec690dd6c31e4b72
Author: Antony Riakiotakis
Date: Mon Nov 24 14:29:09 2014 +0100
Branches: master
https://developer.blender.org/rBfae385029394159428799ef0ec690dd6c31e4b72
Allow explicit control over world background.
Previosuly, world was shown on the background if "Render Only" was used.
Now user should be able to set it independently. This is a prelude to
(drumroll)...
===
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/intern/rna_space.c
===
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 0ea552e..d0cfd19 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2813,6 +2813,7 @@ class VIEW3D_PT_view3d_display(Panel):
col = layout.column()
col.prop(view, "show_only_render")
+col.prop(view, "show_world")
col = layout.column()
display_all = not view.show_only_render
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 21329e6..d681915 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3211,7 +3211,7 @@ static void view3d_main_area_draw_engine_info(View3D
*v3d, RegionView3D *rv3d, A
static void view3d_main_area_clear(Scene *scene, View3D *v3d, ARegion *ar)
{
/* clear background */
- if (scene->world && (v3d->flag2 & V3D_RENDER_OVERRIDE)) { /* clear
with solid color */
+ if (scene->world && (v3d->flag3 & V3D_SHOW_WORLD)) { /* clear with
solid color */
if (scene->world->skytype & WO_SKYBLEND) { /* blend sky */
int x, y;
float col_hor[3];
diff --git a/source/blender/makesdna/DNA_view3d_types.h
b/source/blender/makesdna/DNA_view3d_types.h
index 3efba48..0eee28e 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -201,7 +201,9 @@ typedef struct View3D {
char gridflag;
/* transform widget info */
- char twtype, twmode, twflag, pad2[2];
+ char twtype, twmode, twflag;
+
+ short flag3;
/* afterdraw, for xray & transparent */
struct ListBase afterdraw_transp;
@@ -267,21 +269,24 @@ typedef struct View3D {
((view >= RV3D_VIEW_FRONT) && (view <= RV3D_VIEW_BOTTOM))
/* View3d->flag2 (short) */
-#define V3D_RENDER_OVERRIDE4
-#define V3D_SOLID_TEX 8
-#define V3D_SHOW_GPENCIL 16
-#define V3D_LOCK_CAMERA32
-#define V3D_RENDER_SHADOW 64 /* This is a runtime
only flag that's used to tell draw_mesh_object() that we're doing a shadow pass
instead of a regular draw */
-#define V3D_SHOW_RECONSTRUCTION128
-#define V3D_SHOW_CAMERAPATH256
-#define V3D_SHOW_BUNDLENAME512
-#define V3D_BACKFACE_CULLING 1024
-#define V3D_RENDER_BORDER 2048
-#define V3D_SOLID_MATCAP 4096/* user flag */
-#define V3D_SHOW_SOLID_MATCAP 8192/* runtime flag */
-#define V3D_OCCLUDE_WIRE 16384
-#define V3D_SHADELESS_TEX 32768
-
+#define V3D_RENDER_OVERRIDE(1 << 2)
+#define V3D_SOLID_TEX (1 << 3)
+#define V3D_SHOW_GPENCIL (1 << 4)
+#define V3D_LOCK_CAMERA(1 << 5)
+#define V3D_RENDER_SHADOW (1 << 6)/* This is a
runtime only flag that's used to tell draw_mesh_object() that we're doing a
shadow pass instead of a regular draw */
+#define V3D_SHOW_RECONSTRUCTION(1 << 7)
+#define V3D_SHOW_CAMERAPATH(1 << 8)
+#define V3D_SHOW_BUNDLENAME(1 << 9)
+#define V3D_BACKFACE_CULLING (1 << 10)
+#define V3D_RENDER_BORDER (1 << 11)
+#define V3D_SOLID_MATCAP (1 << 12) /* user flag */
+#define V3D_SHOW_SOLID_MATCAP (1 << 13) /* runtime flag */
+#define V3D_OCCLUDE_WIRE (1 << 14)
+#define V3D_SHADELESS_TEX (1 << 15)
+
+
+/* View3d->flag3 (short) */
+#define V3D_SHOW_WORLD (1 << 0)
/* View3D->around */
#define V3D_CENTER 0
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index 68173eb..cb5da54 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2041,6 +2041,11 @@ static void rna_def_space_view3d(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Only Render", "Display only objects
which will be rendered");
R
[Bf-blender-cvs] [6f81acd] multiview: cleanup: use empty checks instead of counting
Commit: 6f81acd7f986539cbc62effb8b0bf235b4b1849a
Author: Campbell Barton
Date: Mon Nov 24 13:06:52 2014 +0100
Branches: multiview
https://developer.blender.org/rB6f81acd7f986539cbc62effb8b0bf235b4b1849a
cleanup: use empty checks instead of counting
===
M source/blender/blenkernel/intern/image.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
===
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index d98d788..551ef25 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4266,12 +4266,12 @@ int BKE_image_sequence_guess_offset(Image *image)
bool BKE_image_has_anim(Image *ima)
{
- return (BLI_listbase_count_ex(&ima->anims, 1) > 0) && (((ImageAnim *)
ima->anims.first)->anim != NULL);
+ return (!BLI_listbase_is_empty(&ima->anims)) && (((ImageAnim *)
ima->anims.first)->anim != NULL);
}
bool BKE_image_has_packedfile(Image *ima)
{
- return (BLI_listbase_count_ex(&ima->packedfiles, 1) > 0) &&
(((ImagePackedFile *) ima->packedfiles.first)->packedfile != NULL);
+ return (!BLI_listbase_is_empty(&ima->packedfiles)) &&
(((ImagePackedFile *) ima->packedfiles.first)->packedfile != NULL);
}
/**
diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.c
b/source/blender/nodes/composite/nodes/node_composite_switchview.c
index eefb081..f4bc632 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switchview.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switchview.c
@@ -49,7 +49,7 @@ static void cmp_node_switch_view_sanitycheck(bNodeTree
*ntree, bNode *node)
{
bNodeSocket *sock;
- if (BLI_listbase_count_ex(&node->inputs, 1) > 0)
+ if (!BLI_listbase_is_empty(&node->inputs))
return;
sock = ntreeCompositSwitchViewAddSocket(ntree, node, "No View");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [281db46] multiview: picky - naming, arrays were named same as single vars
Commit: 281db468f1c9fe4007279859b2c2b94ece4cb728
Author: Campbell Barton
Date: Mon Nov 24 13:01:19 2014 +0100
Branches: multiview
https://developer.blender.org/rB281db468f1c9fe4007279859b2c2b94ece4cb728
picky - naming, arrays were named same as single vars
===
M source/blender/blenkernel/intern/image.c
===
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 3958d84..d98d788 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2650,7 +2650,7 @@ RenderPass *BKE_image_multilayer_index(RenderResult *rr,
ImageUser *iuser)
if (iuser) {
short index = 0, rv_index, rl_index = 0, rp_index;
- bool is_stereo = RE_RenderResult_is_stereo(rr) && (iuser->flag
& IMA_SHOW_STEREO);
+ bool is_stereo = (iuser->flag & IMA_SHOW_STEREO) &&
RE_RenderResult_is_stereo(rr);
rv_index = is_stereo ? iuser->eye : iuser->view;
@@ -3016,9 +3016,9 @@ static size_t image_num_files(Image *ima)
static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
{
- struct ImBuf **ibuf;
+ struct ImBuf **ibuf_arr;
struct ImBuf *r_ibuf;
- char **name;
+ char **filepath_arr;
bool assign = false;
int flag;
const bool is_multiview = (ima->flag & IMA_IS_MULTIVIEW) != 0;
@@ -3026,10 +3026,10 @@ static ImBuf *image_load_sequence_file(Image *ima,
ImageUser *iuser, int frame)
const size_t totviews = is_multiview ? BLI_listbase_count(&ima->views)
: 1;
size_t i;
- ibuf = MEM_mallocN(sizeof(ImBuf *) * totviews, "Image Views sequence
Imbufs");
- name = MEM_mallocN(sizeof(char *) * totviews, "Image sequence
filepaths");
+ ibuf_arr = MEM_mallocN(sizeof(ImBuf *) * totviews, "Image Views
sequence Imbufs");
+ filepath_arr = MEM_mallocN(sizeof(char *) * totviews, "Image sequence
filepaths");
for (i = 0; i < totfiles; i++)
- name[i] = MEM_mallocN(sizeof(char) * FILE_MAX, "Image sequence
filepath");
+ filepath_arr[i] = MEM_mallocN(sizeof(char) * FILE_MAX, "Image
sequence filepath");
/* XXX temp stuff? */
if (ima->lastframe != frame)
@@ -3051,45 +3051,45 @@ static ImBuf *image_load_sequence_file(Image *ima,
ImageUser *iuser, int frame)
iuser_t.view = i;
/* get the correct filepath */
- BKE_image_user_file_path(&iuser_t, ima, name[i]);
+ BKE_image_user_file_path(&iuser_t, ima, filepath_arr[i]);
/* read ibuf */
- ibuf[i] = IMB_loadiffname(name[i], flag,
ima->colorspace_settings.name);
+ ibuf_arr[i] = IMB_loadiffname(filepath_arr[i], flag,
ima->colorspace_settings.name);
#if 0
- if (ibuf[i]) {
- printf(AT " loaded %s\n", name[i]);
+ if (ibuf_arr[i]) {
+ printf(AT " loaded %s\n", filepath_arr[i]);
}
else {
- printf(AT " missed %s\n", name[i]);
+ printf(AT " missed %s\n", filepath_arr[i]);
}
#endif
}
for (i = 0; i < totfiles; i++) {
- if (ibuf[i]) {
+ if (ibuf_arr[i]) {
#ifdef WITH_OPENEXR
- if (ibuf[i]->ftype == OPENEXR && ibuf[i]->userdata) {
+ if (ibuf_arr[i]->ftype == OPENEXR &&
ibuf_arr[i]->userdata) {
/* handle singlelayer multiview case assign
ibuf based on available views */
- if
(IMB_exr_has_singlelayer_multiview(ibuf[i]->userdata)) {
- image_create_multiview(ima, ibuf[i],
frame);
- IMB_freeImBuf(ibuf[i]);
- ibuf[i] = NULL;
+ if
(IMB_exr_has_singlelayer_multiview(ibuf_arr[i]->userdata)) {
+ image_create_multiview(ima,
ibuf_arr[i], frame);
+ IMB_freeImBuf(ibuf_arr[i]);
+ ibuf_arr[i] = NULL;
}
- else if
(IMB_exr_has_multilayer(ibuf[i]->userdata)) {
+ else if
(IMB_exr_has_multilayer(ibuf_arr[i]->userdata)) {
/* handle multilayer case, don't assign
ibuf. will be handled in BKE_image_acquire_ibuf */
- image_create_multilayer(ima, ibuf[i],
frame);
+ image_create_multilayer(ima,
ibuf_arr[i], frame);
ima->type = IMA_TYPE_MULTILAYER;
-
[Bf-blender-cvs] [54596a8] multiview: Fixing build with OPENEXR disabled
Commit: 54596a84f5f389f4d9d357e2e975a6966fcc2009
Author: Dalai Felinto
Date: Mon Nov 24 09:57:10 2014 -0200
Branches: multiview
https://developer.blender.org/rB54596a84f5f389f4d9d357e2e975a6966fcc2009
Fixing build with OPENEXR disabled
===
M source/blender/blenkernel/intern/image.c
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
===
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 3ae5b25..3958d84 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2807,13 +2807,16 @@ void BKE_image_backup_render(Scene *scene, Image *ima)
}
/ multiview save openexr
*/
+#ifdef WITH_OPENEXR
static const char *image_get_view_cb(void *base, const size_t view_id)
{
Image *ima = base;
ImageView *iv = BLI_findlink(&ima->views, view_id);
return iv ? iv->name : "";
}
+#endif /* WITH_OPENEXR */
+#ifdef WITH_OPENEXR
static ImBuf *image_get_buffer_cb(void *base, const size_t view_id)
{
Image *ima = base;
@@ -2826,9 +2829,11 @@ static ImBuf *image_get_buffer_cb(void *base, const
size_t view_id)
return image_acquire_ibuf(ima, &iuser, NULL);
}
+#endif /* WITH_OPENEXR */
bool BKE_image_save_openexr_multiview(Image *ima, ImBuf *ibuf, const char
*filepath, const int flags)
{
+#ifdef WITH_OPENEXR
char name[FILE_MAX];
bool ok;
@@ -2840,6 +2845,10 @@ bool BKE_image_save_openexr_multiview(Image *ima, ImBuf
*ibuf, const char *filep
ibuf->userdata = NULL;
return ok;
+#else
+ UNUSED_VARS(ima, ibuf, filepath, flags);
+ return false;
+#endif
}
/ multiview load openexr
*/
@@ -2900,6 +2909,7 @@ static void image_add_buffer_cb(void *base, const char
*str, ImBuf *ibuf, const
}
#endif /* WITH_OPENEXR */
+#ifdef WITH_OPENEXR
static void image_update_multiview_flags(Image *ima)
{
if (BLI_listbase_count_ex(&ima->views, 2) > 1) {
@@ -2919,26 +2929,26 @@ static void image_update_multiview_flags(Image *ima)
ima->flag &= ~IMA_IS_MULTIVIEW;
}
}
+#endif /* WITH_OPENEXR */
/* after imbuf load, openexr type can return with a exrhandle open */
/* in that case we have to build a render-result */
+#ifdef WITH_OPENEXR
static void image_create_multiview(Image *ima, ImBuf *ibuf, const int frame)
{
image_free_views(ima);
-#ifdef WITH_OPENEXR
IMB_exr_multiview_convert(ibuf->userdata, ima, image_add_view_cb,
image_add_buffer_cb, frame);
-#endif
image_update_multiview_flags(ima);
-#ifdef WITH_OPENEXR
IMB_exr_close(ibuf->userdata);
-#endif
}
+#endif /* WITH_OPENEXR */
/* after imbuf load, openexr type can return with a exrhandle open */
/* in that case we have to build a render-result */
+#ifdef WITH_OPENEXR
static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
{
const char *colorspace = ima->colorspace_settings.name;
@@ -2946,9 +2956,7 @@ static void image_create_multilayer(Image *ima, ImBuf
*ibuf, int framenr)
ima->rr = RE_MultilayerConvert(ibuf->userdata, colorspace, predivide,
ibuf->x, ibuf->y);
-#ifdef WITH_OPENEXR
IMB_exr_close(ibuf->userdata);
-#endif
ibuf->userdata = NULL;
if (ima->rr)
@@ -2957,6 +2965,7 @@ static void image_create_multilayer(Image *ima, ImBuf
*ibuf, int framenr)
/* set proper multiview flag */
image_init_multilayer_multiview_flag(ima, ima->rr);
}
+#endif /* WITH_OPENEXR */
/* common stuff to do with images after loading */
static void image_initialize_after_load(Image *ima, ImBuf *ibuf)
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index 77ebf77..c326efd 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -79,5 +79,7 @@ boolIMB_exr_multiview_save(
voidIMB_exr_close (void *handle) { (void)handle; }
-bool IMB_exr_has_multilayer(void *handle) { UNUSED_VARS(handle); return false;
}
-bool IMB_exr_has_singlelayer_multiview(void *handle) { UNUSED_VARS(handle);
return false; }
+voidIMB_exr_add_view(void *handle, const char *name) { UNUSED_VARS(handle,
name); }
+int IMB_exr_split_token(const char *str, const char *end, const char
**token) { UNUSED_VARS(str, end, token); return 1; }
+boolIMB_exr_has_multilayer(void *handle) { UNUSED_VARS(handle); return
false; }
+boolIMB_exr_has_singlelayer_multiview(void *handle) { UNUSED_VARS(handle);
return false; }
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/list
[Bf-blender-cvs] [d73d962] multiview: picky - naming
Commit: d73d9629fb657739271551e78a13b5549df19f2e
Author: Campbell Barton
Date: Mon Nov 24 12:49:24 2014 +0100
Branches: multiview
https://developer.blender.org/rBd73d9629fb657739271551e78a13b5549df19f2e
picky - naming
===
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/image.c
M source/blender/editors/space_image/image_ops.c
===
diff --git a/source/blender/blenkernel/BKE_image.h
b/source/blender/blenkernel/BKE_image.h
index a055421..85b220f 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -63,7 +63,7 @@ voidBKE_imbuf_stamp_info(struct Scene *scene, struct
Object *camera, struct
voidBKE_stamp_buf(struct Scene *scene, struct Object *camera, unsigned
char *rect, float *rectf, int width, int height, int channels);
boolBKE_imbuf_alpha_test(struct ImBuf *ibuf);
int BKE_imbuf_write_stamp(struct Scene *scene, struct Object *camera,
struct ImBuf *ibuf, const char *name, struct ImageFormatData *imf);
-voidBKE_imbuf_prepare_write(struct ImBuf *ibuf, struct ImageFormatData
*imf);
+voidBKE_imbuf_write_prepare(struct ImBuf *ibuf, struct ImageFormatData
*imf);
int BKE_imbuf_write(struct ImBuf *ibuf, const char *name, struct
ImageFormatData *imf);
int BKE_imbuf_write_as(struct ImBuf *ibuf, const char *name, struct
ImageFormatData *imf, const bool is_copy);
voidBKE_makepicstring(char *string, const char *base, const char *relbase,
int frame,
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 4e2da68..3ae5b25 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2092,7 +2092,7 @@ bool BKE_imbuf_alpha_test(ImBuf *ibuf)
/* note: imf->planes is ignored here, its assumed the image channels
* are already set */
-void BKE_imbuf_prepare_write(ImBuf *ibuf, ImageFormatData *imf)
+void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
{
char imtype = imf->imtype;
char compress = imf->compress;
@@ -2224,7 +2224,7 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name,
ImageFormatData *imf)
{
int ok;
- BKE_imbuf_prepare_write(ibuf, imf);
+ BKE_imbuf_write_prepare(ibuf, imf);
BLI_make_existing_file(name);
diff --git a/source/blender/editors/space_image/image_ops.c
b/source/blender/editors/space_image/image_ops.c
index 89a818a..1fce3ab 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1720,7 +1720,7 @@ static bool save_image_doit(bContext *C, SpaceImage
*sima, wmOperator *op, SaveI
}
else if ((imf->imtype == R_IMF_IMTYPE_OPENEXR) &&
(imf->views_format == R_IMF_VIEWS_MULTIVIEW)) {
/* treat special Openexr case separetely (this is the
singlelayer multiview OpenEXR */
- BKE_imbuf_prepare_write(ibuf, imf);
+ BKE_imbuf_write_prepare(ibuf, imf);
ok = BKE_image_save_openexr_multiview(ima, ibuf,
simopts->filepath, (IB_rect | IB_zbuf | IB_zbuffloat | IB_multiview));
ED_space_image_release_buffer(sima, ibuf, lock);
}
@@ -1836,7 +1836,7 @@ static bool save_image_doit(bContext *C, SpaceImage
*sima, wmOperator *op, SaveI
colormanaged_ibuf =
IMB_colormanagement_imbuf_for_write(ibuf, save_as_render, true,
&imf->view_settings, &imf->display_settings, imf);
-
BKE_imbuf_prepare_write(colormanaged_ibuf, imf);
+
BKE_imbuf_write_prepare(colormanaged_ibuf, imf);
IMB_prepare_write_ImBuf(IMB_isfloat(colormanaged_ibuf), colormanaged_ibuf);
/* duplicate buffer to prevent locker
issue when using render result */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3480409] multiview: fix for building with glew-mx
Commit: 3480409ae868d95b8ba7f81784866cc70e5b4578
Author: Campbell Barton
Date: Mon Nov 24 12:38:56 2014 +0100
Branches: multiview
https://developer.blender.org/rB3480409ae868d95b8ba7f81784866cc70e5b4578
fix for building with glew-mx
(dont include GL/glew.h direct anymore)
===
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/wm_draw.h
===
diff --git a/source/blender/makesrna/intern/rna_nodetree.c
b/source/blender/makesrna/intern/rna_nodetree.c
index df97ee4..bdb3021 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2618,7 +2618,6 @@ static int rna_Node_image_has_views_get(PointerRNA *ptr)
{
bNode *node = (bNode *)ptr->data;
Image *ima = (Image *)node->id;
- int views;
if (!ima || !(ima->rr)) return 0;
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index 2ff78b5..a17d402 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -91,7 +91,9 @@ EnumPropertyItem space_type_items[] = {
#define V3D_S3D_CAMERA_LEFT{STEREO_LEFT_ID, "LEFT",
ICON_RESTRICT_RENDER_OFF, "Left", ""},
#define V3D_S3D_CAMERA_RIGHT {STEREO_RIGHT_ID, "RIGHT",
ICON_RESTRICT_RENDER_OFF, "Right", ""},
#define V3D_S3D_CAMERA_S3D {STEREO_3D_ID, "S3D", ICON_CAMERA_STEREO,
"3D", ""},
+#ifdef RNA_RUNTIME
#define V3D_S3D_CAMERA_VIEWS {STEREO_MONO_ID, "MONO",
ICON_RESTRICT_RENDER_OFF, "Views", ""},
+#endif
static EnumPropertyItem stereo3d_camera_items[] = {
V3D_S3D_CAMERA_LEFT
@@ -100,11 +102,13 @@ static EnumPropertyItem stereo3d_camera_items[] = {
{0, NULL, 0, NULL, NULL}
};
+#ifdef RNA_RUNTIME
static EnumPropertyItem multiview_camera_items[] = {
V3D_S3D_CAMERA_VIEWS
V3D_S3D_CAMERA_S3D
{0, NULL, 0, NULL, NULL}
};
+#endif
#undef V3D_S3D_CAMERA_LEFT
#undef V3D_S3D_CAMERA_RIGHT
diff --git a/source/blender/windowmanager/intern/wm_stereo.c
b/source/blender/windowmanager/intern/wm_stereo.c
index 048e0ed..2398fca 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -31,7 +31,6 @@
#include
#include
-#include
#include "DNA_listBase.h"
#include "DNA_screen_types.h"
@@ -61,6 +60,7 @@
#include "ED_view3d.h"
#include "ED_screen.h"
+#include "GPU_glew.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
diff --git a/source/blender/windowmanager/wm_draw.h
b/source/blender/windowmanager/wm_draw.h
index ae2bcbd..5dc52b2 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -32,7 +32,7 @@
#ifndef __WM_DRAW_H__
#define __WM_DRAW_H__
-#include
+#include "GPU_glew.h"
#define MAX_N_TEX 3
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c0c2881] multiview: minor edits to last commit
Commit: c0c2881a92a40b08113260e8eb22ceab96547461
Author: Campbell Barton
Date: Mon Nov 24 12:24:42 2014 +0100
Branches: multiview
https://developer.blender.org/rBc0c2881a92a40b08113260e8eb22ceab96547461
minor edits to last commit
===
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
===
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index d45bfec..77ebf77 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -46,7 +46,7 @@ float *IMB_exr_channel_rect(void *handle, const char
*layname, const ch
voidIMB_exr_read_channels (void *handle) { (void)handle; }
voidIMB_exr_write_channels (void *handle) { (void)handle; }
-voidIMB_exrtile_write_channels (void *handle, int partx, int party, int
level, const char *viewname) { UNUSED_VARS((void)handle, partx, party, level,
viewname); }
+voidIMB_exrtile_write_channels (void *handle, int partx, int party, int
level, const char *viewname) { UNUSED_VARS(handle, partx, party, level,
viewname); }
voidIMB_exrmultiview_write_channels(void *handle, const char *viewname) {
UNUSED_VARS(handle, viewname); }
voidIMB_exr_clear_channels (void *handle) { (void)handle; }
@@ -60,16 +60,18 @@ voidIMB_exr_multilayer_convert(
UNUSED_VARS(handle, base, addview, addlayer, addpass);
}
-voidIMB_exr_multiview_convert(void *handle, void *base,
- void (*addview)(void *base, const char *str),
- void (*addbuffer)(void *base, const char
*str, struct ImBuf *ibuf, const int frame), const int frame)
+voidIMB_exr_multiview_convert(
+void *handle, void *base,
+void (*addview)(void *base, const char *str),
+void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf,
const int frame), const int frame)
{
UNUSED_VARS(handle, base, addview, addbuffer, frame);
}
-boolIMB_exr_multiview_save (struct ImBuf *ibuf, const char *name, const
int flags, const size_t totviews,
-const char * (*getview)(void *base, size_t
view_id),
-struct ImBuf * (*getbuffer)(void *base, const
size_t view_id))
+boolIMB_exr_multiview_save(
+struct ImBuf *ibuf, const char *name, const int flags, const size_t
totviews,
+const char * (*getview)(void *base, size_t view_id),
+struct ImBuf * (*getbuffer)(void *base, const size_t view_id))
{
UNUSED_VARS(ibuf, name, flags, totviews, getview, getbuffer);
return false;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [cf1054b] multiview: Support builds without EXR
Commit: cf1054bb7507d0c9027f97a2a4469d0d51099702
Author: Campbell Barton
Date: Mon Nov 24 12:23:05 2014 +0100
Branches: multiview
https://developer.blender.org/rBcf1054bb7507d0c9027f97a2a4469d0d51099702
Support builds without EXR
===
M source/blender/blenkernel/intern/image.c
M source/blender/imbuf/intern/openexr/openexr_multi.h
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
===
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 66f55c7..4e2da68 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2780,6 +2780,8 @@ bool BKE_image_is_openexr(struct Image *ima)
if (ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_SEQUENCE)) {
return BLI_testextensie(ima->name, ".exr");
}
+#else
+ UNUSED_VARS(ima);
#endif
return false;
}
@@ -2841,6 +2843,8 @@ bool BKE_image_save_openexr_multiview(Image *ima, ImBuf
*ibuf, const char *filep
}
/ multiview load openexr
*/
+
+#ifdef WITH_OPENEXR
static void image_add_view_cb(void *base, const char *str)
{
Image *ima = base;
@@ -2894,6 +2898,7 @@ static void image_add_buffer_cb(void *base, const char
*str, ImBuf *ibuf, const
image_assign_ibuf(ima, ibuf, id, frame);
IMB_freeImBuf(ibuf);
}
+#endif /* WITH_OPENEXR */
static void image_update_multiview_flags(Image *ima)
{
diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h
b/source/blender/imbuf/intern/openexr/openexr_multi.h
index 689138d..45ab0ed 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/intern/openexr/openexr_multi.h
@@ -65,20 +65,23 @@ voidIMB_exrtile_write_channels(void *handle, int partx,
int party, int level
voidIMB_exrmultiview_write_channels(void *handle, const char *viewname);
voidIMB_exr_clear_channels(void *handle);
-voidIMB_exr_multilayer_convert(void *handle, void *base,
- void * (*addview)(void *base, const char
*str),
- void * (*addlayer)(void *base, const char
*str),
- void (*addpass)(void *base, void *lay,
const char *str, float *rect, int totchan,
- const char *chan_id, const
char *view));
-
-voidIMB_exr_multiview_convert(void *handle, void *base,
- void (*addview)(void *base, const char *str),
- void (*addbuffer)(void *base, const char
*str, struct ImBuf *ibuf, const int frame),
- const int frame);
-
-boolIMB_exr_multiview_save (struct ImBuf *ibuf, const char *name, const
int flags, const size_t totviews,
-const char * (*getview)(void *base, size_t
view_id),
-struct ImBuf * (*getbuffer)(void *base, const
size_t view_id));
+voidIMB_exr_multilayer_convert(
+void *handle, void *base,
+void * (*addview)(void *base, const char *str),
+void * (*addlayer)(void *base, const char *str),
+void (*addpass)(void *base, void *lay, const char *str, float *rect,
int totchan,
+const char *chan_id, const char *view));
+
+voidIMB_exr_multiview_convert(
+void *handle, void *base,
+void (*addview)(void *base, const char *str),
+void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf,
const int frame),
+const int frame);
+
+boolIMB_exr_multiview_save(
+struct ImBuf *ibuf, const char *name, const int flags, const size_t
totviews,
+const char * (*getview)(void *base, size_t view_id),
+struct ImBuf * (*getbuffer)(void *base, const size_t view_id));
voidIMB_exr_close(void *handle);
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index 178aa9e..d45bfec 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -31,7 +31,7 @@
#include "openexr_api.h"
#include "openexr_multi.h"
-
+#include "BLI_utildefines.h" /* UNUSED_VARS */
void *IMB_exr_get_handle (void) {return NULL;}
void *IMB_exr_get_handle_name (const char *name) {(void)name; return
NULL;}
@@ -42,36 +42,40 @@ int IMB_exr_begin_write (void *handle, const
char *filename, int wid
voidIMB_exrtile_begin_write (void *handle, const char *filename, int
mipmap, int width, int height, int tilex, int tiley) { (void)handle;
(void)filename; (void)mipmap; (void)width; (void)height; (void)tilex;
(void)tiley; }
voidIMB_exr_set_channel (void *handle,
[Bf-blender-cvs] [8f4f6f3] multiview: Merge branch 'master' into multiview
Commit: 8f4f6f34054190711742d58c1a8f51e91417169e
Author: Campbell Barton
Date: Mon Nov 24 12:05:47 2014 +0100
Branches: multiview
https://developer.blender.org/rB8f4f6f34054190711742d58c1a8f51e91417169e
Merge branch 'master' into multiview
===
===
diff --cc source/blender/nodes/composite/node_composite_tree.c
index 2004163,1883b08..f4bb284
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@@ -231,17 -231,15 +231,16 @@@ void *COM_linker_hack = NULL
void ntreeCompositExecTree(Scene *scene, bNodeTree *ntree, RenderData *rd,
int rendering, int do_preview,
const ColorManagedViewSettings *view_settings,
- const ColorManagedDisplaySettings
*display_settings)
+ const ColorManagedDisplaySettings
*display_settings,
+ const char *view_name)
{
#ifdef WITH_COMPOSITOR
- COM_execute(rd, scene, ntree, rendering, view_settings,
display_settings);
+ COM_execute(rd, scene, ntree, rendering, view_settings,
display_settings, view_name);
#else
- (void)scene, (void)ntree, (void)rd, (void)rendering, (void)do_preview;
- (void)view_settings, (void)display_settings, (void)view_name;
- UNUSED_VARS(scene, ntree, rd, rendering, view_settings,
display_settings);
++ UNUSED_VARS(scene, ntree, rd, rendering, view_settings,
display_settings, view_name);
#endif
- (void)do_preview;
+ UNUSED_VARS(do_preview);
}
/* *** */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [08fd38c] master: BLI_utildefines: add UNUSED_VARS() macro
Commit: 08fd38cf52e4d540e6a7d3ceeaedf4a4c3858f55
Author: Campbell Barton
Date: Mon Nov 24 12:01:51 2014 +0100
Branches: master
https://developer.blender.org/rB08fd38cf52e4d540e6a7d3ceeaedf4a4c3858f55
BLI_utildefines: add UNUSED_VARS() macro
===
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenlib/BLI_utildefines.h
M source/blender/editors/space_script/script_edit.c
M source/blender/imbuf/intern/indexer.c
M source/blender/makesrna/intern/rna_define.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/nodes/composite/node_composite_tree.c
M source/creator/creator.c
===
diff --git a/source/blender/blenkernel/intern/constraint.c
b/source/blender/blenkernel/intern/constraint.c
index 574001e..10eb8b7 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1971,7 +1971,7 @@ static void pycon_get_tarmat(bConstraint *con,
bConstraintOb *cob, bConstraintTa
static void pycon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
*targets)
{
#ifndef WITH_PYTHON
- (void)con; (void)cob; (void)targets; /* unused */
+ UNUSED_VARS(con, cob, targets);
return;
#else
bPythonConstraint *data = con->data;
diff --git a/source/blender/blenkernel/intern/context.c
b/source/blender/blenkernel/intern/context.c
index 4b0adaf..5ffc5c5 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -257,7 +257,7 @@ static void *ctx_wm_python_context_get(
}
}
#else
- (void)C, (void)member, (void)member_type;
+ UNUSED_VARS(C, member, member_type);
#endif
/* don't allow UI context access from non-main threads */
diff --git a/source/blender/blenlib/BLI_utildefines.h
b/source/blender/blenlib/BLI_utildefines.h
index 9a8877e..ef1312a 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -497,6 +497,56 @@ extern "C" {
# define UNUSED_FUNCTION(x) UNUSED_ ## x
#endif
+/**
+ * UNUSED_VARS#(a, ...): quiet unused warnings
+ *
+ *
+ * for i in range(16):
+ * args = [(chr(ord('a') + (c % 26)) + (chr(ord('0') + (c // 26 for c
in range(i + 1)]
+ * print("#define _VA_UNUSED_VARS_%d(%s) \\" % (i + 1, ", ".join(args)))
+ * print("\t((void)(%s)%s)" %
+ * (args[0], ((", _VA_UNUSED_VARS_" + str(i) + "(%s)") if i else
"%s") % ", ".join((args[1:]
+ *
+ *
+ */
+
+#define _VA_UNUSED_VARS_1(a0) \
+ ((void)(a0))
+#define _VA_UNUSED_VARS_2(a0, b0) \
+ ((void)(a0), _VA_UNUSED_VARS_1(b0))
+#define _VA_UNUSED_VARS_3(a0, b0, c0) \
+ ((void)(a0), _VA_UNUSED_VARS_2(b0, c0))
+#define _VA_UNUSED_VARS_4(a0, b0, c0, d0) \
+ ((void)(a0), _VA_UNUSED_VARS_3(b0, c0, d0))
+#define _VA_UNUSED_VARS_5(a0, b0, c0, d0, e0) \
+ ((void)(a0), _VA_UNUSED_VARS_4(b0, c0, d0, e0))
+#define _VA_UNUSED_VARS_6(a0, b0, c0, d0, e0, f0) \
+ ((void)(a0), _VA_UNUSED_VARS_5(b0, c0, d0, e0, f0))
+#define _VA_UNUSED_VARS_7(a0, b0, c0, d0, e0, f0, g0) \
+ ((void)(a0), _VA_UNUSED_VARS_6(b0, c0, d0, e0, f0, g0))
+#define _VA_UNUSED_VARS_8(a0, b0, c0, d0, e0, f0, g0, h0) \
+ ((void)(a0), _VA_UNUSED_VARS_7(b0, c0, d0, e0, f0, g0, h0))
+#define _VA_UNUSED_VARS_9(a0, b0, c0, d0, e0, f0, g0, h0, i0) \
+ ((void)(a0), _VA_UNUSED_VARS_8(b0, c0, d0, e0, f0, g0, h0, i0))
+#define _VA_UNUSED_VARS_10(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0) \
+ ((void)(a0), _VA_UNUSED_VARS_9(b0, c0, d0, e0, f0, g0, h0, i0, j0))
+#define _VA_UNUSED_VARS_11(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0) \
+ ((void)(a0), _VA_UNUSED_VARS_10(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0))
+#define _VA_UNUSED_VARS_12(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0, l0) \
+ ((void)(a0), _VA_UNUSED_VARS_11(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0,
l0))
+#define _VA_UNUSED_VARS_13(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0, l0, m0)
\
+ ((void)(a0), _VA_UNUSED_VARS_12(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0,
l0, m0))
+#define _VA_UNUSED_VARS_14(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0, l0, m0,
n0) \
+ ((void)(a0), _VA_UNUSED_VARS_13(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0,
l0, m0, n0))
+#define _VA_UNUSED_VARS_15(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0, l0, m0,
n0, o0) \
+ ((void)(a0), _VA_UNUSED_VARS_14(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0,
l0, m0, n0, o0))
+#define _VA_UNUSED_VARS_16(a0, b0, c0, d0, e0, f0, g0, h0, i0, j0, k0, l0, m0,
n0, o0, p0) \
+ ((void)(a0), _VA_UNUSED_VARS_15(b0, c0, d0, e0, f0, g0, h0, i0, j0, k0,
l0, m0, n0, o0, p0))
[Bf-blender-cvs] [bce859c] multiview: cleanup: clarify src/dst listbase copy
Commit: bce859c805303f6e04c55de0ec9890a943c77a62
Author: Campbell Barton
Date: Mon Nov 24 10:52:12 2014 +0100
Branches: multiview
https://developer.blender.org/rBbce859c805303f6e04c55de0ec9890a943c77a62
cleanup: clarify src/dst listbase copy
===
M source/blender/blenkernel/intern/image.c
===
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 46ab4d9..66f55c7 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -407,45 +407,42 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf,
int index, int frame)
}
}
-static void copy_image_packedfiles(ListBase *lbn, ListBase *lbo)
+static void copy_image_packedfiles(ListBase *lb_dst, const ListBase *lb_src)
{
- ImagePackedFile *imapf, *imapfn;
- lbn->first = lbn->last = NULL;
- imapf = lbo->first;
- while (imapf) {
- imapfn = MEM_mallocN(sizeof(ImagePackedFile), "Image Packed
Files (copy)");
- BLI_strncpy(imapfn->filepath, imapf->filepath,
sizeof(imapfn->filepath));
+ const ImagePackedFile *imapf_src;
- if (imapf->packedfile)
- imapfn->packedfile = dupPackedFile(imapf->packedfile);
+ BLI_listbase_clear(lb_dst);
+ for (imapf_src = lb_src->first; imapf_src; imapf_src = imapf_src->next)
{
+ ImagePackedFile *imapf_dst =
MEM_mallocN(sizeof(ImagePackedFile), "Image Packed Files (copy)");
+ BLI_strncpy(imapf_dst->filepath, imapf_src->filepath,
sizeof(imapf_dst->filepath));
- BLI_addtail(lbn, imapfn);
- imapf = imapf->next;
+ if (imapf_src->packedfile)
+ imapf_dst->packedfile =
dupPackedFile(imapf_src->packedfile);
+
+ BLI_addtail(lb_dst, imapf_dst);
}
}
-static void copy_image_views(ListBase *lbn, ListBase *lbo)
+static void copy_image_views(ListBase *lb_dst, const ListBase *lb_src)
{
- ImageView *iv, *ivn;
- lbn->first = lbn->last = NULL;
- iv = lbo->first;
- while (iv) {
- ivn = MEM_dupallocN(iv);
- BLI_addtail(lbn, ivn);
- iv = iv->next;
+ const ImageView *iv_src;
+
+ BLI_listbase_clear(lb_dst);
+ for (iv_src = lb_src->first; iv_src; iv_src = iv_src->next) {
+ ImageView *iv_dst = MEM_dupallocN(iv_src);
+ BLI_addtail(lb_dst, iv_dst);
}
}
-static void copy_image_anims(ListBase *lbn, ListBase *lbo)
+static void copy_image_anims(ListBase *lb_dst, const ListBase *lb_src)
{
- ImageAnim *ia, *ian;
- lbn->first = lbn->last = NULL;
- ia = lbo->first;
- while (ia) {
- ian = MEM_dupallocN(ia);
- ian->anim = NULL;
- BLI_addtail(lbn, ian);
- ia = ia->next;
+ const ImageAnim *ia_src;
+
+ BLI_listbase_clear(lb_dst);
+ for (ia_src = lb_src->first; ia_src; ia_src = ia_src->next) {
+ ImageAnim *ia_dst = MEM_dupallocN(ia_src);
+ ia_dst->anim = NULL;
+ BLI_addtail(lb_dst, ia_dst);
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ed350d9] master: Fix button to add simple UVs not getting removed after pressing it once.
Commit: ed350d9a52ea4330bde73a6c89171fc6e067e6f7 Author: Antony Riakiotakis Date: Mon Nov 24 10:42:14 2014 +0100 Branches: master https://developer.blender.org/rBed350d9a52ea4330bde73a6c89171fc6e067e6f7 Fix button to add simple UVs not getting removed after pressing it once. === M source/blender/editors/sculpt_paint/paint_image_proj.c === diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 39eea9b..3d0952b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5129,6 +5129,8 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op) DAG_id_tag_update(&ma->id, 0); ED_area_tag_redraw(CTX_wm_area(C)); + BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); + return true; } } @@ -5287,6 +5289,8 @@ static int add_simple_uvs_exec(bContext *C, wmOperator *UNUSED(op)) if (synch_selection) scene->toolsettings->uv_flag |= UV_SYNC_SELECTION; + BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); + DAG_id_tag_update(ob->data, 0); WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data); WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, scene); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [22995bf] multiview: correct bool/flag use
Commit: 22995bf9dcbb04dfd0d122565c929898de74d5e9
Author: Campbell Barton
Date: Mon Nov 24 10:27:35 2014 +0100
Branches: multiview
https://developer.blender.org/rB22995bf9dcbb04dfd0d122565c929898de74d5e9
correct bool/flag use
===
M source/blender/blenkernel/intern/camera.c
M source/blender/compositor/nodes/COM_OutputFileNode.cpp
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/windowmanager/intern/wm_stereo.c
===
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index 0549133..e5ee54a 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -724,7 +724,7 @@ static bool camera_is_left(const char *viewname)
void BKE_camera_model_matrix(RenderData *rd, Object *camera, const char
*viewname, float r_modelmat[4][4])
{
- const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW);
+ const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
if (!is_multiview) {
return camera_model_matrix(camera, r_modelmat);
@@ -772,7 +772,7 @@ static Object *camera_multiview_advanced(Scene *scene,
Object *camera, const cha
/* returns the camera to be used for render */
Object *BKE_camera_render(Scene *scene, Object *camera, const char *viewname)
{
- const bool is_multiview = (scene->r.scemode & R_MULTIVIEW);
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
if (!is_multiview) {
return camera;
@@ -827,7 +827,7 @@ static float camera_stereo3d_shift_x(Object *camera, const
char *viewname)
float BKE_camera_shift_x(RenderData *rd, Object *camera, const char *viewname)
{
- const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW);
+ const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
Camera *data = camera->data;
if (!is_multiview) {
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index eb574b0..acd2602 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -38,7 +38,7 @@ OutputFileNode::OutputFileNode(bNode *editorNode) :
Node(editorNode)
void OutputFileNode::convertToOperations(NodeConverter &converter, const
CompositorContext &context) const
{
NodeImageMultiFile *storage = (NodeImageMultiFile
*)this->getbNode()->storage;
- const bool is_multiview = (context.getRenderData()->scemode &
R_MULTIVIEW);
+ const bool is_multiview = (context.getRenderData()->scemode &
R_MULTIVIEW) != 0;
if (!context.isRendering()) {
/* only output files when rendering a sequence -
diff --git a/source/blender/editors/space_image/image_ops.c
b/source/blender/editors/space_image/image_ops.c
index 0cc35b0..89a818a 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1214,7 +1214,7 @@ static int image_open_invoke(bContext *C, wmOperator *op,
const wmEvent *UNUSED(
/* show multiview save options only if scene has multiviews */
prop = RNA_struct_find_property(op->ptr, "use_multiple_views");
- RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode &
R_MULTIVIEW));
+ RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode &
R_MULTIVIEW) != 0);
image_filesel(C, op, path);
@@ -2335,7 +2335,7 @@ static void image_new_draw(bContext *C, wmOperator *op)
uiLayout *layout = op->layout;
PointerRNA ptr;
Scene *scene = CTX_data_scene(C);
- const bool is_multiview = (scene->r.scemode & R_MULTIVIEW);
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
diff --git a/source/blender/editors/space_node/drawnode.c
b/source/blender/editors/space_node/drawnode.c
index b329012..65155b8 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1681,14 +1681,14 @@ static void node_composit_buts_file_output_ex(uiLayout
*layout, bContext *C, Poi
uiLayout *row, *col;
int active_index;
const bool multilayer = RNA_enum_get(&imfptr, "file_format") ==
R_IMF_IMTYPE_MULTILAYER;
- const bool multiview = scene->r.scemode & R_MULTIVIEW;
+ const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
node_composit_buts_file_output(layout, C, ptr);
uiTemplateImageSettings(layout, &imfptr, false);
/* disable stereo output for multilayer, too much work for something
that no one wi
[Bf-blender-cvs] [8aed4bb] gooseberry: Fix compilation error with SCons
Commit: 8aed4bb1d6ebca161f63335be78c747a34d9ea9f
Author: Sergey Sharybin
Date: Mon Nov 24 14:09:52 2014 +0500
Branches: gooseberry
https://developer.blender.org/rB8aed4bb1d6ebca161f63335be78c747a34d9ea9f
Fix compilation error with SCons
The file wasn't being comiling by CMake, remove it from SCons compilation as
well.
Not sure if the same is required in original branch, maybe it'll be redone
anyway.
For now let's make it so gooseberry branch is compiling nicely on the buildbot.
===
M source/blender/editors/transform/SConscript
===
diff --git a/source/blender/editors/transform/SConscript
b/source/blender/editors/transform/SConscript
index e249856..d1bc958 100644
--- a/source/blender/editors/transform/SConscript
+++ b/source/blender/editors/transform/SConscript
@@ -28,6 +28,7 @@
Import ('env')
sources = env.Glob('*.c')
+sources.remove('manipulator_widget.c')
incs = [
'#/intern/guardedalloc',
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0fb6b7a] multiview: Merge branch 'master' into multiview
Commit: 0fb6b7a71f96c376a676867957653396c1ca99f2 Author: Campbell Barton Date: Mon Nov 24 09:58:21 2014 +0100 Branches: multiview https://developer.blender.org/rB0fb6b7a71f96c376a676867957653396c1ca99f2 Merge branch 'master' into multiview === === ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [7b0d6a1] master: SCons: correct include for win, also minor cleanup
Commit: 7b0d6a1e6c8233722731e77cd1b4641285c0c62d
Author: Campbell Barton
Date: Mon Nov 24 09:33:12 2014 +0100
Branches: master
https://developer.blender.org/rB7b0d6a1e6c8233722731e77cd1b4641285c0c62d
SCons: correct include for win, also minor cleanup
===
M source/blender/blenkernel/SConscript
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenlib/intern/hash_md5.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/windowmanager/intern/wm_operators.c
===
diff --git a/source/blender/blenkernel/SConscript
b/source/blender/blenkernel/SConscript
index 382c1fb..0484200 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -168,6 +168,7 @@ if env['WITH_BF_FREESTYLE']:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc',
'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
+incs += ' ../../../intern/utfconv'
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
diff --git a/source/blender/blenkernel/intern/fcurve.c
b/source/blender/blenkernel/intern/fcurve.c
index 88d7069..d497a38 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -2165,8 +2165,8 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple
*bezts, float evaltime
* the value is simply
the shared value (see T40372 -> F91346)
*/
cvalue = v1[1];
- }
- else {
+ }
+ else {
/* adjust handles so
that they don't overlap (forming a loop) */
correct_bezpart(v1, v2,
v3, v4);
diff --git a/source/blender/blenlib/intern/hash_md5.c
b/source/blender/blenlib/intern/hash_md5.c
index bc7a495..4eec382 100644
--- a/source/blender/blenlib/intern/hash_md5.c
+++ b/source/blender/blenlib/intern/hash_md5.c
@@ -22,7 +22,7 @@
* Written by Ulrich Drepper .
*/
-/** \file blender/blenlib/intern/md5.c
+/** \file blender/blenlib/intern/hash_md5.c
* \ingroup bli
*
* Functions to compute MD5 message digest of files or memory blocks
diff --git a/source/blender/python/generic/idprop_py_api.c
b/source/blender/python/generic/idprop_py_api.c
index b6790de..e77ff8f 100644
--- a/source/blender/python/generic/idprop_py_api.c
+++ b/source/blender/python/generic/idprop_py_api.c
@@ -512,7 +512,7 @@ bool BPy_IDProperty_Map_ValidateAndCreate(PyObject
*name_obj, IDProperty *group,
else {
IDProperty *prop_exist;
- /* avoid freeing when types match incase they are referenced by
the UI, see: T37073
+ /* avoid freeing when types match in case they are referenced
by the UI, see: T37073
* obviously this isn't a complete solution, but helps for
common cases. */
prop_exist = IDP_GetPropertyFromGroup(group, prop->name);
if ((prop_exist != NULL) &&
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 7961619..f993f82 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1402,7 +1402,7 @@ wmOperator *WM_operator_last_redo(const bContext *C)
}
/**
- * Use for drag & drop a path or name with opeators invoke() function.
+ * Use for drag & drop a path or name with operators invoke() function.
*/
ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short
idcode)
{
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
