diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-19 17:04:43 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-19 17:04:43 +0400 |
commit | 2557eaf0dd33e3139cc6188b97029207686360bf (patch) | |
tree | 8a8fa61fcde1c3715b18d945c4ff9ea3eda5af19 | |
parent | 776c6e66b2064f2a6934a726f4fcc317b709d6fd (diff) |
print names of nodes/sockets when cycles complains about only being able to connect a closure to another closure.
-rw-r--r-- | doc/manpage/blender.1 | 54 | ||||
-rw-r--r-- | intern/cycles/render/graph.cpp | 5 |
2 files changed, 27 insertions, 32 deletions
diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1 index 6257a78171b..c7a762f08c7 100644 --- a/doc/manpage/blender.1 +++ b/doc/manpage/blender.1 @@ -1,13 +1,4 @@ -.TH "BLENDER" "1" "April 26, 2012" "Blender Blender 2\&.63 (sub 0) - build date: 2012-04-26 - build time: 19:38:31 - build revision: 45987 - build platform: Linux - build type: Debug - build c flags: -fopenmp -msse2 -msse -pipe -fPIC -funsigned-char -fno-strict-aliasing -Wall -Wcast-align -Werror=declaration-after-statement -Werror=implicit-function-declaration -Werror=return-type -Wstrict-prototypes -Wno-char-subscripts -Wno-unknown-pragmas -Wpointer-arith -Wunused-parameter -Wwrite-strings - build c++ flags: -D__STDC_CONSTANT_MACROS -fopenmp -msse2 -msse -pipe -fPIC -funsigned-char -fno-strict-aliasing -Wall -Wno-invalid-offsetof -Wno-sign-compare - build link flags: -pthread - build system: CMake" +.TH "BLENDER" "1" "July 19, 2012" "Blender Blender 2\&.63 (sub 14)" .SH NAME blender \- a 3D modelling and rendering package @@ -24,7 +15,7 @@ Use Blender to create TV commercials, to make technical visualizations, business http://www.blender.org .SH OPTIONS -Blender 2.63 (sub 0) +Blender 2.63 (sub 14) Usage: blender [args ...] [file] [args ...] .br .SS "Render Options:" @@ -223,18 +214,6 @@ Turn debugging on Enable floating point exceptions .br -.TP -.B \-\-debug\-ffmpeg -.br -Enable debug messages from FFmpeg library -.br - -.TP -.B \-\-debug\-libmv -.br -Enable debug messages from libmv library -.br - .IP .TP @@ -258,12 +237,6 @@ Set the BLENDER_SYSTEM_SCRIPTS environment variable .br .TP -.B \-\-env\-system\-plugins -.br -Set the BLENDER_SYSTEM_PLUGINS environment variable -.br - -.TP .B \-\-env\-system\-python .br Set the BLENDER_SYSTEM_PYTHON environment variable @@ -316,7 +289,7 @@ Enable automatic python script execution, (default) .TP .B \-Y or \-\-disable\-autoexec .br -Disable automatic python script execution (pydrivers, pyconstraints, pynodes) +Disable automatic python script execution (pydrivers & startup scripts) .br .IP @@ -384,6 +357,26 @@ Enable all debug messages (excludes libmv) .br .TP +.B \-\-debug\-value <value> +.br +Set debug value of <value> on startup +.br + +.IP + +.TP +.B \-\-debug\-jobs +.br +Enable time profiling for background jobs. +.br + +.TP +.B \-\-verbose <verbose> +.br +Set logging verbosity level. +.br + +.TP .B \-R .br Register .blend extension, then exit (Windows only) @@ -421,7 +414,6 @@ Arguments are executed in the order they are given. eg \fIBLENDER_SYSTEM_DATAFILES\fR Directory for system wide data files. \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries. \fITMP\fR or \fITMPDIR\fR Store temporary files here. - \fISDL_AUDIODRIVER\fR LibSDL audio driver \- alsa, esd, dma. \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python. .br .br diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 34c8879aa1f..18e802b610d 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -187,7 +187,10 @@ void ShaderGraph::connect(ShaderOutput *from, ShaderInput *to) if(from->type != to->type) { /* for closures we can't do automatic conversion */ if(from->type == SHADER_SOCKET_CLOSURE || to->type == SHADER_SOCKET_CLOSURE) { - fprintf(stderr, "ShaderGraph connect: can only connect closure to closure.\n"); + fprintf(stderr, "ShaderGraph connect: can only connect closure to closure " + "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderInput:%s, type:%d).\n", + from->parent->name.c_str(), from->name, (int)from->type, + to->parent->name.c_str(), to->name, (int)to->type); return; } |